diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 30cd031074d..67ab35a6c1a 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 0c31e92ab0b9bae06f87f456c0b909d406e24e28..9bb16d69089308b4c6b76f8d52450266807f45d4 100644 +index f7c0061cc62b658ec880b65ccbc788363407622e..511cd6999b6a5a1e8010151e7a4ba16d6027b3ad 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4044,6 +4044,7 @@ if (is_android) { +@@ -4056,6 +4056,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 17af962f8eb..f8efc7f6c7f 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index d04f32ed436615ae2de7642dc8e8a48c58d04a5e..b953b41d7460071b4b9ebb626e26df1258d8cd2e 100644 +index 34e5219079ed2a0ffc39434452b1e4cb2173bd7c..ebef5f20c6c4f09648afe653167f0a0124177110 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index e15024ca578..a1e00095b44 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 7cb128011c52dbf36b2d506ba5c7cb8fc907003f..246892f9b4e1f8b018bfc99b4063e16f27d66fdb 100644 +index 5ad08f6f7fe0cb3a0548c9b43cbee085b2400d2d..2b4d33fd79f410c3f026b6efe9d93b9768a17573 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -479,6 +479,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 7590993fd30..7b49ea573a2 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 5de2cf037449f20ba142dd150d49bdb9bc91a0e6..693c46cba78783bbb94769ca56e0e912161f1124 100644 +index 8a6abe6bfc7ea3834c220e460fba397a63a84e59..866d84e7e8edba73ebfa767ee512af7939ee792c 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1632,6 +1632,7 @@ config("chromium_code") { +@@ -1633,6 +1633,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 567b512aa0e..1e1849194fb 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index a51f1c5ae20d13758a2a1d050e26473dce25e491..6d88cc15abf0bdcd5f5393dbe848b7906525bfe2 100644 +index 1f2223b770bb2b8a09aaf7c783baa3b3ab7f97d5..ad3f609e106055ae15be323d6a975772260c309c 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -253,6 +253,7 @@ android_resources("chrome_app_java_resources") { @@ -10,7 +10,7 @@ index a51f1c5ae20d13758a2a1d050e26473dce25e491..6d88cc15abf0bdcd5f5393dbe848b790 } if (enable_vr) { -@@ -621,6 +622,7 @@ android_library("chrome_java") { +@@ -622,6 +623,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,7 +18,7 @@ index a51f1c5ae20d13758a2a1d050e26473dce25e491..6d88cc15abf0bdcd5f5393dbe848b790 srcjar_deps = [ ":autofill_verification_status_generated_enum", -@@ -653,6 +655,7 @@ android_library("chrome_java") { +@@ -654,6 +656,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index a51f1c5ae20d13758a2a1d050e26473dce25e491..6d88cc15abf0bdcd5f5393dbe848b790 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -771,6 +774,7 @@ java_group("chrome_all_java") { +@@ -772,6 +775,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index a51f1c5ae20d13758a2a1d050e26473dce25e491..6d88cc15abf0bdcd5f5393dbe848b790 } # This is a list of all base module jni headers. New features should add their -@@ -816,6 +820,7 @@ group("jni_headers") { +@@ -817,6 +821,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index a51f1c5ae20d13758a2a1d050e26473dce25e491..6d88cc15abf0bdcd5f5393dbe848b790 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2169,6 +2174,7 @@ if (current_toolchain == default_toolchain) { +@@ -2170,6 +2175,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index a51f1c5ae20d13758a2a1d050e26473dce25e491..6d88cc15abf0bdcd5f5393dbe848b790 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2568,6 +2574,7 @@ android_library("base_module_java") { +@@ -2569,6 +2575,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 89e64625ffc..0f39d9df030 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index aa125349c40d6a4d624845cad4058d14f5912ebd..256ae1cffa1c0ec1f1a946c07ab6177b233c19d2 100644 +index 93ed1da22d0ac0bb485bfc4a8e71f37ba7b14e53..0378df22b6aab5409f24611ce64c86c5a094c34f 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1248,3 +1248,4 @@ chrome_java_sources = [ +@@ -1250,3 +1250,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index cc9f9018980..77f6309f1bd 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index a7101806ac380a77c8e993b6c8c40fe77bdbdbdf..d5589315cb25bee2a3adfa4ae570f5d4ac29fcdb 100644 +index aaddeee04877ae94d525772dcdd9b97061430ff0..2ecdfd0162f353fcfa46d81e5bd73339a463b997 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -59,7 +59,9 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch index e9d7e5395b2..16ad28c1428 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -index b50522a40419fb8f6ba40a2820ae5b21ba186387..ff9c53aa9069b4d64f72d284db2f6153b07d1ee4 100644 +index e27dda1c4c18d3032b90664c1990e81d4f539913..61389673f6bb4ac8e342cf9f34229b861c619c00 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java @@ -74,7 +74,7 @@ public abstract class AppHooks { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 949494fe6c7..f3aa308507a 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index c01752a677b6a7147c80ff67c571cb3eb318412e..ed6b0a8b82f06c37d99f268b495b03127648ac66 100644 +index f242814764c6aca8bd58904c31f0f43cedf8e4ac..330c0541950cb6a15820a555e9b4439e930f8bac 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2383,6 +2383,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -390,7 +390,7 @@ public abstract class ChromeActivity private boolean mLastPictureInPictureModeForTesting; protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch index 1d9e1f8a7b1..edfa5b9e0f5 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -index 1eceff519bfa8e7bac64ea65fd58ce4b4db86191..b5256e7cefc87be964a65dd32802f24163f184c7 100644 +index 02ff6a9bf22c4a24214904ff161d0e2cf44dc42c..e67d7ec3f9db77527ee8127071dc8f41ed4cfd87 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -256,6 +256,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -226,6 +226,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer /* observer = */ this, offlinePageBridge); int maxRows = 2; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index baf20af5ec8..060a9484a79 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index aceb920b21367a090c2128b80bd4f935ce3b6226..84f057c881994fc691429726ac6a21f7660bd83d 100644 +index 78709cf41dd22659c34e1f1b93be0912aadd73dd..189a7071ad4902c1556a21042e46f7ae6474fecd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity; diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 59de6502e2d..7d80b283aad 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 3e78abd85c494e6898384be7b3efed0b0b936f2f..381c0b7b5f1842dbbb9ae375b60b3eb1a7dc977a 100644 +index f58cace19d0dde5240e30c8bf1844e200ae5b497..8fefd081fe87d6b406961064b2213858982330ad 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2547,6 +2547,7 @@ static_library("browser") { +@@ -2544,6 +2544,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 2e7dd8125bc..94a521622ce 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index a6900963066c50051b8a663ccd6b743d17b72319..54fe079ca5a3d1593fe2ece7d4b5ccb9cfdf97ca 100644 +index 8cfaba0bfbe4a554ed12c4d8428373d655beb865..777c73397c7cdbc8393feaa7fce47492e3ea5c42 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7770,6 +7770,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7737,6 +7737,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index a31ca8b2c2e..9a1d325630f 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 39e04010a1d4fb67df3b36326ada1d66ecd9ccf6..11465152c86a102b6cc65f02317f89023030615c 100644 +index 05ae95f83ac264c4a200ae24363840295a466188..2a88cdd38b82c05471b5ffd4ef09f2cb6c5a45c4 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -774,6 +774,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -767,6 +767,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 4e50d181f94..a0e9fb3150a 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 6b289ff82b9f881109dfaf3b4cf6948f45d7268d..72a9045e88769bc39570937fe64a92b86e034e89 100644 +index e53cc16ec645a6664b377cdfb632f853df37cce7..3ea05cfee4cf037d01ab37317ba501fed86aafd3 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1329,6 +1329,7 @@ static_library("extensions") { +@@ -1340,6 +1340,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch index ba5fed71e6c..aa017d8638f 100644 --- a/patches/chrome-browser-extensions-extension_service.h.patch +++ b/patches/chrome-browser-extensions-extension_service.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h -index e9f1a9e98b520c1a0c70b23f35557c91f0adef68..bf5a87b264f16086b93a10fae2b7009558915191 100644 +index 34a7a419b6d18a7fdd7f238a948edd53ce7363ac..00143694df8132192dca409178b206c1001d5035 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h -@@ -468,6 +468,7 @@ class ExtensionService : public ExtensionServiceInterface, +@@ -466,6 +466,7 @@ class ExtensionService : public ExtensionServiceInterface, static base::AutoReset DisableExternalUpdatesForTesting(); private: diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch index ed9f135dc17..ff189ba3d20 100644 --- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch +++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc -index e3a69e27433144b479768cf2b8c7e102cc80be53..790c8d082e3bd08f982a54c6292041767f5e1075 100644 +index f0dbd620ef82a704374959b79cef3e47f13e027e..81aeb3d83fe67ae5e0a70f4648e1258c339aa1c8 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -795,6 +795,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 4dc435274c0..0b7c1ce1e5e 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index da8604dc62ce8ed75d3f52629c5d2a3ad0b377d9..5073cfecc9b337f1e28d0b81f41ef8e0dede276b 100644 +index 6aa5e1e4f31c1ebbb30546b14d7bb37ac26965b4..b97fb6e9202db83f5c50d631c286577a129809dc 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -365,6 +365,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -368,6 +368,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index baa5e0d0d2e..33ec181f036 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 5ab77d95c9843992dfd0eaeb21828e63e649594d..5020c90b36338c99393b9a72fe2c3c9a769bdd19 100644 +index b56a834825f03e2f9104ab2a08b659f547c5c577..d19620d4faa15214f27c765ebea3e73971b021f0 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1111,6 +1111,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1119,6 +1119,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 5ab77d95c9843992dfd0eaeb21828e63e649594d..5020c90b36338c99393b9a72fe2c3c9a // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1426,6 +1427,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1433,6 +1434,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, registry->RegisterBooleanPref(prefs::kPrivacyReviewShowWelcomeCard, true); RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 838c88410cf..fd9865a75a0 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index b38cf45dfba65140be109c0a2c9f97a2ef98b98a..b6a9841387f38d2cf959ccb0993f559e2d6d57cd 100644 +index 3193bec584a99d86f26a9b220fdfcce665c72cd1..093b50fc945d8167ff6529c258325fd2139de715 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1857,6 +1857,7 @@ void RenderViewContextMenu::AppendSearchProvider() { diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index e69701becf4..ba382b41ece 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 2c3503d4bb7fde67e15a8750ecbe26eaa4d7aa87..c909f38155c179a526e459c1b29d9adfbef90799 100644 +index f4e0c8f07e34556c375093cc8e75384e0bf7ebf8..8108f3e05c2e26bd48331903e4d5729ea32aa7ee 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -149,6 +149,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, diff --git a/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch index 52db2452c5a..7a9b6e1244b 100644 --- a/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/api_listener.ts b/chrome/browser/resources/bookmarks/api_listener.ts -index 49dbba8a713601549c5d93bf8a8c2dcd2431888c..8b7295b922c22c14b5534d1a36d99d337cca40d3 100644 +index 4e9ee19d39377ee7c7f2453bc3f289a7b57035bb..20084fb27e9e7faddc89495ab19d0586d94c2718 100644 --- a/chrome/browser/resources/bookmarks/api_listener.ts +++ b/chrome/browser/resources/bookmarks/api_listener.ts @@ -118,6 +118,7 @@ function onChildrenReordered( diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch index 612ec1d532f..eb166f0e746 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts -index 1e5ac435ed6c55c6824aab2f504ad73d35a2e8a4..4d594f14ef151549da76ffcf3edb77f661f2a9c4 100644 +index 092a3a2ebcf502b7d39037d20dfb138c8d2c6d8c..1beb2971406d8214cb1bbc8331abb0c88983d4bf 100644 --- a/chrome/browser/resources/bookmarks/command_manager.ts +++ b/chrome/browser/resources/bookmarks/command_manager.ts -@@ -425,7 +425,7 @@ export class BookmarksCommandManagerElement extends +@@ -429,7 +429,7 @@ export class BookmarksCommandManagerElement extends chrome.bookmarks.export(); break; case Command.HELP_CENTER: diff --git a/patches/chrome-browser-resources-downloads-downloads.ts.patch b/patches/chrome-browser-resources-downloads-downloads.ts.patch index 217d9f98a24..59be3c50823 100644 --- a/patches/chrome-browser-resources-downloads-downloads.ts.patch +++ b/patches/chrome-browser-resources-downloads-downloads.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/downloads.ts b/chrome/browser/resources/downloads/downloads.ts -index 9f65f8a15761c67888eba6c64a9677b12470de6c..ff6d557774dcefc7a3a5914f900448f5788becd6 100644 +index 5eb97207ad0a632d34a960f064c2a55be267baeb..a80a5062d53eea16434b65f5ecea8a69b8e96768 100644 --- a/chrome/browser/resources/downloads/downloads.ts +++ b/chrome/browser/resources/downloads/downloads.ts @@ -2,6 +2,7 @@ @@ -9,4 +9,4 @@ index 9f65f8a15761c67888eba6c64a9677b12470de6c..ff6d557774dcefc7a3a5914f900448f5 +import 'chrome://brave-resources/polymer_overriding.js' import './manager.js'; - export {BrowserProxy} from './browser_proxy.js'; + export {CrToastManagerElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js'; diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 967efef742e..ed6243fb343 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 9e5760e10f99967294208a91ff406a502b873d3b..b3143375715e958aab6b2d03e8a50966c0626a46 100644 +index a33c27f34e14e34ae19493620b3475000e07ac6e..9b914bcdb157f9bb569b7db12fd06b3f339a7f7e 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn @@ -98,6 +98,7 @@ generate_grd("build_grd") { @@ -8,7 +8,7 @@ index 9e5760e10f99967294208a91ff406a502b873d3b..b3143375715e958aab6b2d03e8a50966 } + deps += [ "//brave/browser/resources/settings:resources" ] } - + preprocess_if_expr("preprocess") { @@ -786,4 +787,6 @@ ts_library("build_ts") { ":preprocess", diff --git a/patches/chrome-browser-resources-tools-optimize_webui.py.patch b/patches/chrome-browser-resources-tools-optimize_webui.py.patch index 8fd10d18402..302a1f2cd32 100644 --- a/patches/chrome-browser-resources-tools-optimize_webui.py.patch +++ b/patches/chrome-browser-resources-tools-optimize_webui.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/tools/optimize_webui.py b/chrome/browser/resources/tools/optimize_webui.py -index fed846255df646626dfc26d079488a9592efcba8..faa107481502bc36db6a7852c3ce92cbc7d5a825 100755 +index 35fa2bb6f6ef15715fbdb5d16769f6e0bb4f91d7..c75f34cecb1008102693933ea18f04010f6cbc0d 100755 --- a/chrome/browser/resources/tools/optimize_webui.py +++ b/chrome/browser/resources/tools/optimize_webui.py @@ -26,6 +26,7 @@ import node_modules diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index c6412d484b0..8677955f64b 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 24db506058f8d4b381293f091b653465ec9abebf..f136684278def689bee5cdbf8ee7ef1fd975eddf 100644 +index de03968eb51aa52e5f838f30d718e9cf603deaff..21023770da984bc8da016f533a587e831d2cd4e6 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -646,6 +646,7 @@ static_library("ui") { +@@ -644,6 +644,7 @@ static_library("ui") { "//ui/webui/resources/cr_components/most_visited:mojom", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 24db506058f8d4b381293f091b653465ec9abebf..f136684278def689bee5cdbf8ee7ef1f # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3597,10 +3598,13 @@ static_library("ui") { +@@ -3593,10 +3594,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 565072c28d3..fae447024af 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 73ab8b8f7cef86544fe3dfd13482e2fa35a76eb1..81b08e92ab4a6a473655ae0aa06dd3ac3d9b84fc 100644 +index d23327c87abf83ef3540348f3d551bd14fe8e2fd..b29b34bcf46fcf948f2de8506f26aab8b638592f 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -446,6 +446,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { - // static - Browser* Browser::Create(const CreateParams& params) { +@@ -446,6 +446,7 @@ Browser* Browser::Create(const CreateParams& params) { + // not possible, e.g. using the wrong profile or during shutdown. The caller + // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); + BRAVE_BROWSER_CREATE return new Browser(params); diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch index 79efbf5c371..3f270f7a9d7 100644 --- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch +++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc -index f15dba73a0b60eb75e4cbd70097ec8ec46993c00..40e6e93687a4caf93afc525f97f7b5b527c002d9 100644 +index 8e063b88ae980ccba37604f11d1c7762c1afe66d..e7df2fae3e61ade245bc0c7070fbe9482fb570b2 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc @@ -50,7 +50,6 @@ ExtensionActionViewController::Create( diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch index 11e10f22272..77c47bb7eb4 100644 --- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch +++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h -index 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf366395f028c9f 100644 +index b7e62ff328c7f7817853464f1606e4c89568ecba..23c6c83db7be375b3c53e3b75168d3d467427f84 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.h +++ b/chrome/browser/ui/extensions/extension_action_view_controller.h @@ -17,6 +17,7 @@ @@ -18,7 +18,7 @@ index 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf36639 // The different options for showing a popup. enum PopupShowAction { SHOW_POPUP, SHOW_POPUP_AND_INSPECT }; -@@ -130,6 +132,7 @@ class ExtensionActionViewController +@@ -135,6 +137,7 @@ class ExtensionActionViewController // In some cases (such as when an action is shown in a menu), a substitute // ToolbarActionViewController should be used for showing popups. This // returns the preferred controller. @@ -26,7 +26,7 @@ index 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf36639 ExtensionActionViewController* GetPreferredPopupViewController(); // Executes the extension action with |show_action|. If -@@ -145,6 +148,7 @@ class ExtensionActionViewController +@@ -150,6 +153,7 @@ class ExtensionActionViewController // The popup may not be shown synchronously if the extension is hidden and // first needs to slide itself out. // Returns true if a popup will be shown. @@ -34,7 +34,7 @@ index 53a5f7b7d9295f0f5eadd5e8f736fa9bfc3ce9f8..9ae81d1a7c4fd1e5ba02d497fdf36639 bool TriggerPopupWithUrl(PopupShowAction show_action, const GURL& popup_url, bool grant_tab_permissions); -@@ -155,6 +159,7 @@ class ExtensionActionViewController +@@ -160,6 +164,7 @@ class ExtensionActionViewController PopupShowAction show_action); // Handles cleanup after the popup closes. diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 4456c7a4cfb..e14c6a94ba6 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index cb0280678c32365e2c40acd22785cf2846ce2fc8..d1328661f61b703c9c49b7b3238a7ba33d00ffe2 100644 +index cf738ba296933dce1cb6ad5e4eb33f521830663a..d21ac4c891781f663cd05b04f62f6d2da11b0afb 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -372,6 +372,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(bool process_startup) { +@@ -367,6 +367,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(bool process_startup) { #if !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch index a84386b905d..dc0b6cca4ba 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index c49add0900d5b0287557d7a43e443648d3af33a3..d3f36f231b31bb6ea596451bf367d0a0d2ea7396 100644 +index 20a701c91c9ea5568c7a31100c46143adb7764e9..78d99a21d62f79f675c7460af4f1afe0f864a94b 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -694,6 +694,7 @@ class BrowserView : public BrowserWindow, +@@ -698,6 +698,7 @@ class BrowserView : public BrowserWindow, return accessibility_focus_highlight_.get(); } diff --git a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch index f1bb1ce8c6a..f5e2eebb64c 100644 --- a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc -index c7aeb84058c5441b7cac58dd54ac1faebe0f2ef3..6a37c2e31357e5e915ed70b64ad2a475da6b722d 100644 +index 2bfcf932ab39c2df18c7424ac699a58bb3a478fa..35222cfc69f2a96affd185f361e0c9020b00e75a 100644 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc -@@ -136,6 +136,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( +@@ -140,6 +140,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( for (permissions::PermissionRequest* request : GetVisibleRequests()) AddRequestLine(request); diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch index 837deb4e781..f000c3324bf 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -index 00c3df0c614714076cc2cf788729e45a02a1e9c6..45fcf2405505265e0913a89bab46bc6fbbd00577 100644 +index 4118ac3c8217bc8e1b5b3285520bf6da429de6e8..02733535179ffe1ed86a529d546cd7dd39659b44 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h @@ -168,6 +168,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 7f86be47170..adbf88ebac0 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index c4a6d823b9c6524160a094f9036986bf0f8a31b1..6f174b527ce114de36b152fe483ff7d46ff8f3da 100644 +index 411caf8f33d7fbb9fb6f79503538ade57f748d3a..506b0b160900b1a3a941720af0feb6c106f6d07b 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1247,6 +1247,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1246,6 +1246,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index 5a5804c4412..9b744099e6d 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index 254a2af70811444890398e214eda83ac5682c638..eceadb540bf8d3b53e4f284d5c2c6f2b7d1114c1 100644 +index f92240357c9e04d559eb2c8d52b2c9f678a63d47..1117825b5f31a548711aec266344833b08a81cd4 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc @@ -817,6 +817,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 021966766f6..c7a0ea619f6 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 8f3318df76cd52262ae81b9593f48ebd7cd4b86a..d622df392d55fa6efc25cc8b30c3ecf6dfa66bf7 100644 +index 787d4c301db9dafcf954072ff9f48da1576771f8..5f287e3c090056a0d0638e4cf554b4121ea793a6 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2887,6 +2887,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2900,6 +2900,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 52f30663209..404ac20a7e4 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 40888f0caf2dedbd1e592d080dbb8e56e4a13814..3d8ea5dcc9f49ccd4fff8e726ebde85495b1da33 100644 +index 8b3cfdd7a95ccc77c6acb0baa959b851183a7f49..812d909b0827a318df5174aa2e3e023429b36e9c 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -86,6 +86,7 @@ source_set("channel_info") { @@ -10,7 +10,7 @@ index 40888f0caf2dedbd1e592d080dbb8e56e4a13814..3d8ea5dcc9f49ccd4fff8e726ebde854 } source_set("ini_parser") { -@@ -552,6 +553,7 @@ static_library("non_code_constants") { +@@ -551,6 +552,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-setup-BUILD.gn.patch b/patches/chrome-installer-setup-BUILD.gn.patch index f7aa11d6015..95785ace2d3 100644 --- a/patches/chrome-installer-setup-BUILD.gn.patch +++ b/patches/chrome-installer-setup-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn -index 86d45bc10ece1375bc0493731ad74d57a6c55df0..2b8319b92494eced38b0a30f463a1c0367587502 100644 +index f3964983b8a917184453fffcb5a8537f29f11eea..d939db0d317d22266cc3016c1572247e973afb00 100644 --- a/chrome/installer/setup/BUILD.gn +++ b/chrome/installer/setup/BUILD.gn @@ -51,6 +51,7 @@ if (is_win) { diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index 442e5364119..1692c5b951f 100644 --- a/patches/chrome-installer-util-shell_util.cc.patch +++ b/patches/chrome-installer-util-shell_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc -index 64f5b457beef20050da88c2e1aedaa5f65935c0f..8e86b1c96df9a29991ee9b1b61727b4a469d5652 100644 +index 80c1a2a7ab63538a68b8874f30d016b2bbf756d8..1135ac0bcd41078312193f8b630d15eef8fced2b 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -359,6 +359,7 @@ void GetChromeProgIdEntries( diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 2de3fe4b6e7..3fba0e0c79f 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 43331d5740bd0ef3252ad91491d157d4943ae70b..55f83ddd64d0dcbdd262f1b731593b8f003ad4f0 100644 +index ff49b57dddcdae9d8294e7f7d22cb82b4be05164..303fc0498027dae1618793158e9436a4105635df 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -534,7 +534,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -531,7 +531,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index e181bc0aa4e..013dfab3441 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 124bef92ee46d927c549e680db5397dd203086d3..6380f1e28c39003f6a0072fe8aff14b3b3aabe0b 100644 +index 3a91e0cdb4c554fbebfcde57a81dd1efab140c66..44b225e334d19ea905a1a22cdab4f6dcb98d18c2 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -308,6 +308,7 @@ static_library("test_support") { diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index ad5568d6664..8bca98d067d 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index b28b7824086c96a6a12ff6cddace6667af6ad0da..11dedd0f0b8a4fba414590f8d7bb22d7088ed823 100644 +index 20100043a1aff37a9b2e00ab0678bda2d35a0f7f..d234c49e85dbc6112fd52c8afe0119ee1720ca8c 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -395,6 +395,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch index 651938a0f6c..6e7244bb07e 100644 --- a/patches/components-page_info-BUILD.gn.patch +++ b/patches/components-page_info-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn -index 2e2807e4a3b7978d09fc1dcf04420d4f962741b7..2a5d8961941de583337abc6f46b19ec8cbf10a81 100644 +index 50a796587f1ade0d9e8b313e4395a447feb88236..11225b8c8c48e3a65d212c8261c939d356ef13c9 100644 --- a/components/page_info/BUILD.gn +++ b/components/page_info/BUILD.gn @@ -70,6 +70,7 @@ static_library("page_info") { diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch index fd0c2c319c4..71285e962c5 100644 --- a/patches/components-permissions-request_type.cc.patch +++ b/patches/components-permissions-request_type.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc -index 7bda599c5069aa8ea946a87a20d33da6e4b951d7..a2f3f7f4f160590f59e5797c0e00a66d42e24c46 100644 +index 38331567c128cd604b3f79adc2ab4a4990a4b59c..9eca28accfa0477278c2a56dc1782766fdce8d53 100644 --- a/components/permissions/request_type.cc +++ b/components/permissions/request_type.cc -@@ -311,6 +311,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { +@@ -314,6 +314,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { case permissions::RequestType::kWindowPlacement: return "window_placement"; #endif diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch index 6d73f046aae..464774cfda4 100644 --- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch +++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc -index 2ea5c4a65cd9f65cbe3b0e7b906d4e76076c4be3..39e736202d06ea981f1370a467fa25edd2beeb41 100644 +index 2a5312568d0e29f6533a88720220bc159442e312..38a1d84af0b2907f8a240256fd42eaaf76b91197 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc @@ -140,6 +140,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 9acb2d8fa64..22c12e61e0f 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index ec79eb3113bfc847f667055150766ff4eeb1015e..3a49364741851b4cba01160d38be0a4ec8582aba 100644 +index c129c1e8d9bbbcdbd3b26b57eabfab848f8ff1b6..f8a29e947f211eaf7dc06f8f8a61ed0fceaacf7e 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h @@ -392,6 +392,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { diff --git a/patches/components-variations-variations_seed_store.cc.patch b/patches/components-variations-variations_seed_store.cc.patch index 4aa17453d7e..85344c1bcea 100644 --- a/patches/components-variations-variations_seed_store.cc.patch +++ b/patches/components-variations-variations_seed_store.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc -index 3ef06da2b9352410cc005f883f7c3ccad5eaccca..6a41a40dbb02875baae8202bf9f33f9893b43a5c 100644 +index be96a5a2ac3ffe8a968927ebb566d45646434571..d1ab36cda36461d472ebc6090d49226dc7d0397a 100644 --- a/components/variations/variations_seed_store.cc +++ b/components/variations/variations_seed_store.cc -@@ -35,6 +35,7 @@ namespace { +@@ -36,6 +36,7 @@ namespace { // The ECDSA public key of the variations server for verifying variations seed // signatures. const uint8_t kPublicKey[] = { diff --git a/patches/content-browser-browser_main_loop.h.patch b/patches/content-browser-browser_main_loop.h.patch index 7ef2f818cdd..2230fe95878 100644 --- a/patches/content-browser-browser_main_loop.h.patch +++ b/patches/content-browser-browser_main_loop.h.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h -index 2c13914c1fbf8b81b6b0dc5d059d48525ac9f059..d892797328b582649dc9595afb947f1eb97696d1 100644 +index b80577fe2ac2e9aac657dea9f8d2916d96c411b5..39390167ab4e168a904e35e0640526ffd861ad68 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h @@ -157,6 +157,7 @@ class CONTENT_EXPORT BrowserMainLoop { diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 31041dfead2..883e0074705 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 8402d228cf6b811163b7a50a4b158bf804d73689..375af66f61f4fc481bde90c92d5269a988d55e51 100644 +index 69f854c867c0d68a714b43ecb87584cdd644f4e7..eec00237db2cf1760ba7ca49dbf73f0f207a3475 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3196,16 +3196,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3161,16 +3161,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 099877bd0d4..ce55a23ac8d 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 054cc94f106458e67687c373196d955bfe408089..b7e88869c1e2504be82542494d984ee9a1a27503 100644 +index 72870788123478840b947a1e45367277aff1e5d1..fcd59c128eb8b88ae712984e54b4e0bf6ea0c664 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2477,6 +2477,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2478,6 +2478,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index 054cc94f106458e67687c373196d955bfe408089..b7e88869c1e2504be82542494d984ee9 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -3708,6 +3709,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -3706,6 +3707,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch index b9fa25c6fb2..bc9db7a397a 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index 94e9d0ffb1b8382c590ea4e4ebdb7bee794e97f7..2ed08a3538ccdf67bc5a4fd2061ebd7ccd711d16 100644 +index c8c389b8fa8d81a7ce8677b9e4e6445c73d22980..da877109bd1ee599c2c54b19de2352200bf8e755 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc @@ -75,6 +75,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHostImpl* frame_host) diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch index 07a155af002..e97dc1992de 100644 --- a/patches/content-common-user_agent.cc.patch +++ b/patches/content-common-user_agent.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc -index 25facd610551cefa60a445152e72a9d519f007ca..59fd65496f3a88e3891eaecc9f4d077dc2e29112 100644 +index b625d63e16c6a51dcd098ac79691561f9fa8131a..bd90245c1bca8cf6aa90d5c8fef039c70460c4e3 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc @@ -311,6 +311,7 @@ std::string GetAndroidOSInfo( diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index d7496f18d17..ba5aceb0867 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index f9ee9bbb985f98d28c5a96ad250a43b2a9d33123..b81132935f5fb86674d6a3e362184f0acfb4e121 100644 +index 4532a2f2e29ae9d8b7d3b13eee2d51711b83210c..0d3c810a410cbb79cb790375d90090ccdca49b9b 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1917,6 +1917,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1909,6 +1909,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 04549ef21f2..6eb9f7a5be4 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index c379de15f5f85c99af234845b29dc14efcdf1245..6326428214f561c168cb5d48da8229d3bd1bb41e 100644 +index 0a366dab6ac61c8fa9b510c99c6088ae2bf1513f..5ac0435681edc03b5238f0b92500171d47e72e12 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4506,6 +4506,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4510,6 +4510,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index ca5deb287d7..15260f12a39 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 4ec07ea25a4dd022c8b746ce27484fb1d958bee2..888029fec04c0ef4a4a98c44c395f1606a880266 100644 +index 4f7ea9bd9117ec3ed6bdddbd8fbb16be77991e98..fbf3c5fb3164d4089c78d9ab30c90e858a7e7f72 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1008,6 +1008,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -1002,6 +1002,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index e42cfd37621..e7052847e45 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index de0cc2fd342bbbb2c1d7144b6c20d59391a7b37d..6ccab2c50af54e767f56d906d817cc4db586d5cd 100644 +index 55166a73f3bcae3c5dc1926f8c4e7bf14d9e3fc2..023dd3345dd78ee2b00a7ee07d3745522c86cf17 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1327,6 +1327,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1329,6 +1329,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 253c65083f7..509b33725d3 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 6d6cb19fcba561f1ed960adb6b7ae94609076f11..d069134ad2268858c5ff23611a6bbcf0748b8f88 100644 +index 55195b6efe2dde8502df0c16b16b5eb1285def6a..2d2e7c1ec3833144d94a7c1ba6eb4d9ba9e1c540 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1137,6 +1137,7 @@ component("net") { +@@ -1139,6 +1139,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index 19c77fe166b..59e8e6024d4 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index e3720d750ae60a4e9df8f0571e13e4e5671d0798..91b0209fc4f9a6e0dde83a9e0a8cf8fe3c9d4eb1 100644 +index 7373d02f3b2ce94bc11d6d72c46ada7485b81f76..87c30fc4bd274a2499496f02f4e7e1f5594e2981 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc @@ -543,6 +543,7 @@ std::unique_ptr CanonicalCookie::Create( diff --git a/patches/net-dns-host_cache.cc.patch b/patches/net-dns-host_cache.cc.patch index b6d2ec8dc50..fb659c8c002 100644 --- a/patches/net-dns-host_cache.cc.patch +++ b/patches/net-dns-host_cache.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc -index f9ea4fa082b3b03b888be09d12045a463966f3fc..b70aebac7f78ac92c62edfbe073439d2bce3edf8 100644 +index 6a66063175431249387bc7b41fc6b266c0de722d..926302b1011b80d09bde3e33b59ca30c9171153c 100644 --- a/net/dns/host_cache.cc +++ b/net/dns/host_cache.cc @@ -259,6 +259,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const { diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch index a8248c175c4..45296c061bf 100644 --- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch +++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc -index 0ce7755d352dc595925d18c65737a1349415855e..9c79419a179c04e4f43f3ea55dae0c2be20a185d 100644 +index 42826c7e162fcf5169dba897af07005a91887586..f9038b0a1e45fb7742da7ef7375774669eb6e447 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc @@ -1032,6 +1032,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously( diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index 28c61b7a06b..8852b7cd186 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 3357d7ab1fbdb4af293525acfe465e4726289fa8..0814f9d12deecdea051336932b675a6510a61409 100644 +index a79840a89366d3078662262b0c000602af5387f4..cf00e14d625ed4c3ffe2caad68f28db459cfc78e 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni @@ -2490,6 +2490,7 @@ generated_interface_sources_in_modules = [ diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index c69a4866cfd..4777459d9a0 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 8bc03b278497214a2ef6b98a13f8722926e3dba6..e038c50b5324d09667f2d28545842cf626926fb6 100644 +index a949e8a56acd278494e628e61f740a83ac150e48..420985d6aceccdc0eb8fb27b5b32529f1d5b11ad 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -187,6 +187,7 @@ component("core") { +@@ -188,6 +188,7 @@ component("core") { visibility = [] # Allow re-assignment of list. visibility = [ "//third_party/blink/*" ] @@ -10,7 +10,7 @@ index 8bc03b278497214a2ef6b98a13f8722926e3dba6..e038c50b5324d09667f2d28545842cf6 sources = [ "core_initializer.cc", -@@ -297,6 +298,7 @@ component("core") { +@@ -300,6 +301,7 @@ component("core") { "//v8", ] diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 7c94ff1133a..e6df194c7d4 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 21c5b221e0cfeced6fdb09d3cb81820ef1b4f5a7..9c5ce8c54896a45972218e95bb45d2b26c6febe3 100644 +index 74da3401712028bac0f897659ec1b8778a3f297f..843a4f5ebe7d764a806934eecd2f112b3c8498fb 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -951,6 +951,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -955,6 +955,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 3c8480e748f..dcf42fee687 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index b41e606a413c5cb97620f2b72a775a2ecefaf3cf..6266c5a856f82e84bb3ba9f956ba2b40b74e6955 100644 +index 4abde0551c57b324be5de1ee4575fc5e88115a03..944001c15145b09703ffb47e91cb332d39673dc9 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -15,6 +15,7 @@ if (is_android) { diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index ba5f38b44b1..7651ce6dc31 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index 3139bb5869aa2a0c4fb0da9a2fead7d3399ad9fb..9339a5c91dba96ad8bbbabf2cd070ac4fcc30a7c 100644 +index 1cf01a92abbd646846086d3462530e613db6e1b3..e2217b2f3479b3616e5c0006c3e1a18629f071a4 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -2217,6 +2217,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -2215,6 +2215,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 3139bb5869aa2a0c4fb0da9a2fead7d3399ad9fb..9339a5c91dba96ad8bbbabf2cd070ac4 int sx, int sy, int sw, -@@ -2334,6 +2335,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2332,6 +2333,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index 65c2835b190..79cda98cdf4 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -index 79dd45644b2a6cfe032f18d1966f660e9e2a3b3c..0f14ce41b793dd2f436f5174f317d1f9eee5e160 100644 +index 80c57bc0593e3aed984c90afa534a4ae10208e2e..3afb77331f53fd4f1ec12f5249632f8e6bebd0f4 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc @@ -905,6 +905,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 0a210d94b7b..fbf5bc9d4dc 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acbd666b711 100644 +index 3e65fb11f7cabeef3a803e6943a534500b5ea512..4b842ba998349ef87662aabaefff697fcd735733 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -2934,6 +2934,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2936,6 +2936,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2965,6 +2966,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2967,6 +2968,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -2995,6 +2997,7 @@ absl::optional>> +@@ -2997,6 +2999,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3009,6 +3012,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3011,6 +3014,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3042,6 +3046,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3044,6 +3048,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb switch (pname) { case GL_BUFFER_USAGE: { -@@ -3188,6 +3193,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3190,6 +3195,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3588,6 +3594,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3590,6 +3596,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3603,6 +3610,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3605,6 +3612,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3695,6 +3703,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3697,6 +3705,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3750,6 +3759,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3752,6 +3761,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3760,6 +3770,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3762,6 +3772,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3811,6 +3822,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3813,6 +3824,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3842,6 +3854,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3844,6 +3856,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3872,6 +3885,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3874,6 +3887,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3884,6 +3898,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3886,6 +3900,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb return EnsureNotNull(shader->Source()); } -@@ -3913,6 +3928,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3915,6 +3930,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3947,6 +3963,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3949,6 +3965,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4206,6 +4223,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4208,6 +4225,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4230,6 +4248,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4232,6 +4250,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4307,6 +4326,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4309,6 +4328,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 63be15f9edd9ef99985926c6878067292d2d8c55..0a32f6262e274a14967f1b3610e72acb GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4654,6 +4674,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4656,6 +4676,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 57f81460cc0..a996205c0da 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index afe7c2a8ef85615c3119dbf39400b6d1c46052e3..4fdb316b913c2f76f990587fa505cf2eddcbec27 100644 +index aede47525221af4381ee532b16a388b968c413ef..433b42035b80404d42b663ac12e2ef4bd58e7a66 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -51,6 +51,9 @@ diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch index 1e09420828b..bb6fe44c38b 100644 --- a/patches/tools-licenses.py.patch +++ b/patches/tools-licenses.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/licenses.py b/tools/licenses.py -index f251273b8958f46ee94f3e04b6e1a3c32b8f1f73..2eaba7e9bbedbe54dd1fc2e35f3f08b2b333451e 100755 +index beac8b9ef1ef44e3308376f0f80ea7b6cb2e0b9e..a69dab99bece48fd5726b251c7e87203439d11db 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -35,6 +35,7 @@ else: @@ -28,7 +28,7 @@ index f251273b8958f46ee94f3e04b6e1a3c32b8f1f73..2eaba7e9bbedbe54dd1fc2e35f3f08b2 # Add all subdirectories that are not marked for skipping. for dir in dirs: dirpath = os.path.join(path, dir) -@@ -717,7 +720,8 @@ def GenerateCredits(file_template_file, +@@ -719,7 +722,8 @@ def GenerateCredits(file_template_file, for path in third_party_dirs: try: metadata = ParseDir(path, _REPOSITORY_ROOT) diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index 643ece1ede0..e560532f0b0 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index afc8d23d771e5e2f72f0a143beb43b92781441a3..63cc5b6b162a12a78604a3e4b2a5f11e82679c8d 100644 +index 09e0f8b551017d2ba6e467403773a0b84f8e67f7..f506ca3270aa7a9078f602735e5c25a314567b9a 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -@@ -12630,6 +12630,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -12632,6 +12632,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index 9533598ebc7..7a9f5c4b87c 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm -index f0b2527e167e07f4b44c78a2f0c4a7ae74d705d6..86bf5f95e26d0d729f23476ae72f081f7945f805 100644 +index e73a470a87cccb26b97e91c235804fcdd0f4383b..800ceb560228a039164c3ed824a404681e8845de 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm -@@ -1335,6 +1335,7 @@ bool IsAXSetter(SEL selector) { +@@ -1340,6 +1340,7 @@ bool IsAXSetter(SEL selector) { if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index cb869200090..a8663b3c348 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index b3bdbcc3b49481d68bd90cfbafb4798b97e942ed..388e34b87117ec8f7000672e21741e59304e6505 100644 +index 97f9f3fc792187024dae594b1ec256cb558b077a..d8f0850a8bee976a000834865f952efe880128d1 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -468,6 +468,7 @@ component("base") { +@@ -469,6 +469,7 @@ component("base") { "//ui/strings", "//url", ]