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

Unverified Commit 1a7a702c authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Rebase to 128.0.6613.40

parent 4798757d

build/patches/Add-AllowUserCertificates-flag.patch

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =

             "AdaptiveButtonInTopToolbarTranslate";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =

@@ -575,6 +576,8 @@ public abstract class ChromeFeatureList {

@@ -576,6 +577,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidTabGroupStableIds =

             newCachedFlag(ANDROID_TAB_GROUP_STABLE_IDS, true);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, false);
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);

@@ -731,6 +734,7 @@ public abstract class ChromeFeatureList {

@@ -734,6 +737,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAccountReauthenticationRecentTimeWindow,

build/patches/Add-a-flag-to-disable-GamePad-API.patch

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -7861,9 +7861,9 @@

@@ -7866,9 +7866,9 @@

     "expiry_milestone": 130

   },

   {

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

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;

 import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;

 import org.chromium.chrome.browser.device.DeviceClassManager;

@@ -2001,6 +2002,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -2006,6 +2007,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

             throw new IllegalStateException(

                     "Attempting to access TabCreator before initialization");

         }
@@ -2105,7 +2105,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. 
diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/components/omnibox/browser/autocomplete_provider_client.cc

--- a/components/omnibox/browser/autocomplete_provider_client.cc

+++ b/components/omnibox/browser/autocomplete_provider_client.cc

@@ -42,3 +42,7 @@ base::WeakPtr<AutocompleteProviderClient>

@@ -46,3 +46,7 @@ base::WeakPtr<AutocompleteProviderClient>

 AutocompleteProviderClient::GetWeakPtr() {

   return nullptr;

 }

build/patches/Add-bookmark-import-export-actions.patch

+1 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -537,6 +537,7 @@ public abstract class ChromeFeatureList {

@@ -538,6 +538,7 @@ public abstract class ChromeFeatureList {

     public static final String VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR =

             "VerticalAutomotiveBackButtonToolbar";

     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";

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

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

 

 namespace {

@@ -4153,6 +4157,10 @@ const FeatureEntry::FeatureVariation

@@ -4162,6 +4166,10 @@ const FeatureEntry::FeatureVariation

          nullptr}};

 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
@@ -594,7 +594,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.

@@ -4179,6 +4187,9 @@ const FeatureEntry::FeatureVariation

@@ -4188,6 +4196,9 @@ const FeatureEntry::FeatureVariation

 const FeatureEntry kFeatureEntries[] = {

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

 // //tools/flags/generate_unexpire_flags.py.
@@ -655,7 +655,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -1047,5 +1047,6 @@ BASE_FEATURE(kWebApkAllowIconUpdate,

@@ -1052,5 +1052,6 @@ BASE_FEATURE(kWebApkAllowIconUpdate,

              "WebApkAllowIconUpdate",

              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -665,7 +665,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

--- a/chrome/browser/flags/android/chrome_feature_list.h

+++ b/chrome/browser/flags/android/chrome_feature_list.h

@@ -203,6 +203,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(

@@ -204,6 +204,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(

     "trigger_id",

     /*default_value=*/"");
@@ -687,7 +687,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
 import java.util.List;

 import java.util.Map;

 

@@ -718,7 +722,7 @@ public abstract class ChromeFeatureList {

@@ -721,7 +725,7 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sWebApkMinShellApkVersion =

             newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
@@ -696,7 +696,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
             List.of(

                     sAccountReauthenticationRecentTimeWindow,

                     sAndroidAppIntegration,

@@ -813,6 +817,13 @@ public abstract class ChromeFeatureList {

@@ -817,6 +821,13 @@ public abstract class ChromeFeatureList {

                     sVerticalAutomotiveBackButtonToolbar,

                     sWebApkMinShellApkVersion);
@@ -1411,7 +1411,7 @@ diff --git a/components/version_ui/version_handler_helper.cc b/components/versio 
diff --git a/content/common/features.cc b/content/common/features.cc

--- a/content/common/features.cc

+++ b/content/common/features.cc

@@ -616,4 +616,5 @@ BASE_FEATURE(kScrollBubblingFix,

@@ -607,4 +607,5 @@ BASE_FEATURE(kScrollBubblingFix,

 

 // Please keep features in alphabetical order.
@@ -1420,7 +1420,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc 
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc

--- a/content/public/common/content_features.cc

+++ b/content/public/common/content_features.cc

@@ -1325,4 +1325,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {

@@ -1334,4 +1334,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {

          VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;

 }
@@ -1429,7 +1429,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c 
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h

--- a/content/public/common/content_features.h

+++ b/content/public/common/content_features.h

@@ -291,6 +291,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);

@@ -292,6 +292,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);

 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();

 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();