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

Commit 123bd2ca authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3747-master-upstream' into 'master' 

Update chromium to v141.0.7390.111

See merge request !107
parents 1fa1d7aa b94499e0

build/cromite_patches/Add-a-proxy-configuration-page.patch

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

 #include "chrome/browser/background/extensions/background_mode_manager.h"

 #endif

@@ -1685,6 +1687,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

@@ -1692,6 +1694,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   component_updater::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);

build/cromite_patches/Add-an-always-incognito-mode.patch

+1 −1
Original line number Diff line number Diff line
@@ -1747,7 +1747,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"

 #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"

 #include "chrome/browser/android/preferences/browser_prefs_android.h"

@@ -2138,6 +2139,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,

@@ -2145,6 +2146,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,

   usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);

   variations::VariationsService::RegisterProfilePrefs(registry);

   webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);

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

+3 −3
Original line number Diff line number Diff line
@@ -1009,7 +1009,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

@@ -1612,5 +1612,5 @@ BASE_FEATURE(DisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

@@ -1623,5 +1623,5 @@ BASE_FEATURE(DisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);

 // happen silently without prompting an updating dialog.

 BASE_FEATURE(SilentPolicyAndDefaultAppUpdating,

              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -2063,7 +2063,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp 
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc

--- a/third_party/blink/common/features.cc

+++ b/third_party/blink/common/features.cc

@@ -2566,4 +2566,5 @@ bool IsXrDevice() {

@@ -2569,4 +2569,5 @@ bool IsXrDevice() {

 //

 // DO NOT ADD NEW FEATURES HERE.
@@ -2072,7 +2072,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea 
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h

--- a/third_party/blink/public/common/features.h

+++ b/third_party/blink/public/common/features.h

@@ -1903,6 +1903,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();

@@ -1908,6 +1908,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();

 //

 // DO NOT ADD NEW FEATURES HERE.

build/cromite_patches/Content-settings-infrastructure.patch

+1 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c 
+      permission_.setting = CONTENT_SETTING_ASK;

+      break;

+    case 4:

+      permission_.setting = CONTENT_SETTING_DEFAULT;

+      permission_.setting = std::nullopt;

+      break;

+  }

+  PermissionChanged();

build/cromite_patches/Disable-all-predictors-code.patch

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_ 
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -1197,7 +1197,6 @@ void ChromeBrowserMainExtraPartsProfiles::

@@ -1201,7 +1201,6 @@ void ChromeBrowserMainExtraPartsProfiles::

       base::FeatureList::IsEnabled(

           permissions::features::kPermissionOnDeviceGeolocationPredictions) ||

       base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {