Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88b014a7 authored by Saalim Quadri's avatar Saalim Quadri
Browse files

Merge branch '3781-master-upstream' into 'master' 

browser: Update to 142.0.7444.171

See merge request !113
parents ff379446 31fef1a9

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ build-cromite-x64: 
  stage: filters

  rules:

    - if: $CI_PIPELINE_SOURCE == "schedule"

    - if: $CI_COMMIT_BRANCH == "master"

    - when: manual

    - if: $CI_PIPELINE_SOURCE != "merge_request_event"



update-filters:

  stage: filters

build/cromite_patches/Add-cromite-flags-support.patch

+9 −9
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 namespace about_flags {

 

 namespace {

@@ -4966,6 +4970,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

@@ -4977,6 +4981,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

      std::size(kSeamlessSigninPromoTypeTwoButtons), nullptr}};

 #endif  // BUILDFLAG(IS_ANDROID)
@@ -676,7 +676,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 // RECORDING USER METRICS FOR FLAGS:

 // -----------------------------------------------------------------------------

 // The first line of the entry is the internal name.

@@ -4992,6 +5000,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

@@ -5003,6 +5011,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

 const FeatureEntry kFeatureEntries[] = {

 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and

 // //tools/flags/generate_unexpire_flags.py.
@@ -1010,7 +1010,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc 
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc

--- a/chrome/common/chrome_features.cc

+++ b/chrome/common/chrome_features.cc

@@ -1696,5 +1696,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

@@ -1694,5 +1694,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

 // happen silently without prompting an updating dialog.

 BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,

              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -2024,18 +2024,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h 
diff --git a/net/base/features.cc b/net/base/features.cc

--- a/net/base/features.cc

+++ b/net/base/features.cc

@@ -839,4 +839,5 @@ BASE_FEATURE_PARAM(size_t,

                    "cache_size",

                    64);

@@ -852,4 +852,5 @@ BASE_FEATURE_PARAM(std::string,

                    "quic_options",

                    "");

 

+#include "cromite_flags/net_base_features_cc.inc"

 }  // namespace net::features

diff --git a/net/base/features.h b/net/base/features.h

--- a/net/base/features.h

+++ b/net/base/features.h

@@ -935,6 +935,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kDnsFilteringDetails);

 NET_EXPORT BASE_DECLARE_FEATURE(kUpdateIsMainFrameOriginRecentlyAccessed);

 NET_EXPORT BASE_DECLARE_FEATURE_PARAM(size_t, kRecentlyAccessedOriginCacheSize);

@@ -946,6 +946,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kTryQuicByDefault);

 // separate the values with a comma (e.g. "ABCD,EFGH").

 NET_EXPORT BASE_DECLARE_FEATURE_PARAM(std::string, kQuicOptions);

 

+#include "cromite_flags/net_base_features_h.inc"

 }  // namespace net::features

build/cromite_patches/Add-option-to-force-tablet-UI.patch

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over 
 import org.chromium.ui.base.LocalizationUtils;

 import org.chromium.ui.base.WindowAndroid;

 import org.chromium.ui.util.ColorUtils;

@@ -5039,8 +5040,13 @@ public class StripLayoutHelper

@@ -5040,8 +5041,13 @@ public class StripLayoutHelper

         mCloseButtonMenu.setAnchorView(tabView);

         // 3. Set the vertical offset to align the close button menu with bottom of the tab strip

         int tabHeight = mManagerHost.getHeight();

build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch

+25 −1
Original line number Diff line number Diff line
@@ -7,8 +7,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../android/java/res/xml/privacy_preferences.xml  |  5 +++++

 .../chrome/browser/ChromeTabbedActivity.java      |  5 ++++-

 .../browser/privacy/settings/PrivacySettings.java | 15 ++++++++++++++-

 .../browser/tab_group_sync/StartupHelper.java     |  6 ++++++

 .../ui/android/strings/android_chrome_strings.grd |  6 ++++++

 4 files changed, 29 insertions(+), 2 deletions(-)

 5 files changed, 35 insertions(+), 2 deletions(-)



diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

--- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -101,6 +102,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         Preference secureDnsPref = findPreference(PREF_SECURE_DNS);

         if (secureDnsPref != null && secureDnsPref.isVisible()) {

             secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));

diff --git a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java b/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java

--- a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java

+++ b/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java

@@ -4,6 +4,7 @@

 

 package org.chromium.chrome.browser.tab_group_sync;

 

+import org.chromium.base.ContextUtils;

 import org.chromium.base.metrics.RecordHistogram;

 import org.chromium.build.annotations.NullMarked;

 import org.chromium.chrome.browser.preferences.Pref;

@@ -74,6 +75,11 @@ public class StartupHelper {

      */

     public void initializeTabGroupSync() {

         LogUtils.log(TAG, "initializeTabGroupSync");

+        if (ContextUtils.getAppSharedPreferences().getBoolean("close_tabs_on_exit", false)) {

+            for (String tabGroupId : mTabGroupSyncService.getAllGroupIds()) {

+                mTabGroupSyncService.removeGroup(tabGroupId);

+            }

+        }

         // First close the groups that were deleted remotely when the activity was not running.

         closeDeletedGroupsFromTabModel();

 

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

build/cromite_patches/Add-site-engagement-flag.patch

+14 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 chrome/browser/about_flags.cc                 |  1 +

 .../engagement/important_sites_util.cc        |  9 +++++

 .../browser/media/media_engagement_service.cc |  4 ++-

 .../auto_picture_in_picture_tab_helper.cc     |  2 +-

 .../internal/tracker_impl.cc                  |  3 ++

 .../public/feature_configurations.cc          |  7 ++++

 .../content/site_engagement_score.cc          |  5 +++
@@ -17,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 components/site_engagement/core/features.cc   | 30 ++++++++++++++++

 components/site_engagement/core/features.h    | 34 +++++++++++++++++++

 .../Add-site-engagement-flag.inc              | 10 ++++++

 10 files changed, 108 insertions(+), 1 deletion(-)

 11 files changed, 109 insertions(+), 2 deletions(-)

 create mode 100644 components/site_engagement/core/features.cc

 create mode 100644 components/site_engagement/core/features.h

 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc
@@ -87,6 +88,18 @@ diff --git a/chrome/browser/media/media_engagement_service.cc b/chrome/browser/m 
 }

 

 // static

diff --git a/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc b/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc

--- a/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc

+++ b/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc

@@ -42,7 +42,7 @@ AutoPictureInPictureTabHelper::AutoPictureInPictureTabHelper(

           Profile::FromBrowserContext(web_contents->GetBrowserContext()))),

       auto_blocker_(PermissionDecisionAutoBlockerFactory::GetForProfile(

           Profile::FromBrowserContext(web_contents->GetBrowserContext()))),

-      media_engagement_service_(MediaEngagementService::Get(

+      media_engagement_service_(!MediaEngagementService::IsEnabled() ? nullptr : MediaEngagementService::Get(

           Profile::FromBrowserContext(web_contents->GetBrowserContext()))),

       clock_(base::DefaultTickClock::GetInstance()) {

   // `base::Unretained` is safe here since we own `tab_observer_helper_`.

diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components/feature_engagement/internal/tracker_impl.cc

--- a/components/feature_engagement/internal/tracker_impl.cc

+++ b/components/feature_engagement/internal/tracker_impl.cc