diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index e08008dafaf..05d58f7cbb5 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 2561c2726d27ea2d2175dc52d0906481a231456a..b4fca385580601e7c3a419d8e2c6881fbb6675d5 100644 +index 9247e9b3f4c92e6f573898049bca784cccb4b19c..e88caf45e09e864d42be27352eff26d34562d117 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4437,6 +4437,7 @@ if (is_android) { +@@ -4407,6 +4407,7 @@ if (is_android) { "android/java/src/org/chromium/base/ValueChangedCallback.java", "android/java/src/org/chromium/base/WrappedClassLoader.java", ] @@ -10,7 +10,7 @@ index 2561c2726d27ea2d2175dc52d0906481a231456a..b4fca385580601e7c3a419d8e2c6881f if (use_clang_profiling) { sources += [ -@@ -4886,6 +4887,7 @@ if (is_android) { +@@ -4871,6 +4872,7 @@ if (is_android) { "android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java", ] @@ -18,7 +18,7 @@ index 2561c2726d27ea2d2175dc52d0906481a231456a..b4fca385580601e7c3a419d8e2c6881f } android_library("base_cached_flags_java") { -@@ -4912,6 +4914,7 @@ if (is_android) { +@@ -4896,6 +4898,7 @@ if (is_android) { "android/java/src/org/chromium/base/cached_flags/ValuesOverridden.java", "android/java/src/org/chromium/base/cached_flags/ValuesReturned.java", ] diff --git a/patches/base-test-BUILD.gn.patch b/patches/base-test-BUILD.gn.patch index 522947fafd1..b1003ffa034 100644 --- a/patches/base-test-BUILD.gn.patch +++ b/patches/base-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn -index 911214ce799e06fb18c522fea44ac6458f76ea8f..ce2cabcc3346e92bcfb04421cfc83c63d5f9956c 100644 +index d26f4d09dd3ddbb201f15f870c065b686063bb88..d9e9981ec5635714cfa5d311072ae03a78244d0f 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn @@ -346,6 +346,7 @@ static_library("test_support") { diff --git a/patches/base-test-launcher-test_results_tracker.cc.patch b/patches/base-test-launcher-test_results_tracker.cc.patch index 270fd7f5d54..341e864d6b3 100644 --- a/patches/base-test-launcher-test_results_tracker.cc.patch +++ b/patches/base-test-launcher-test_results_tracker.cc.patch @@ -1,8 +1,8 @@ diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc -index ff79865a4b80f2ca8619721a4c197584a35ee8a6..3c6e08dad12930748455a09a4cb3460b4b0d805a 100644 +index 535ad1f4e7fc08885c0f33fed63ec5aab6fa9dbe..c4b7727306e964485ebfe78d07ae5f42daaa179f 100644 --- a/base/test/launcher/test_results_tracker.cc +++ b/base/test/launcher/test_results_tracker.cc -@@ -150,6 +150,7 @@ TestResultsTracker::~TestResultsTracker() { +@@ -152,6 +152,7 @@ TestResultsTracker::~TestResultsTracker() { : ""), result.GetTestCaseName().c_str()); if (result.status != TestResult::TEST_SUCCESS) { diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index 2502834c229..6463c844e47 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index e297d5ce778666d8692eb1b72c8424927446eccb..9f2d71e90f6df3afee1cf656ace00b12f732703a 100644 +index 0de909d74fffc91b9e3afead3204f9c8234fa131..0ca35931519b75a86ad80f3938956507f27cade9 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -751,6 +751,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBaseSyncPrimitives { +@@ -732,6 +732,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { ScopedAllowBaseSyncPrimitives& operator=( const ScopedAllowBaseSyncPrimitives&) = delete; diff --git a/patches/build-android-gyp-lint.py.patch b/patches/build-android-gyp-lint.py.patch index 55486d253f4..0a714b3c31a 100644 --- a/patches/build-android-gyp-lint.py.patch +++ b/patches/build-android-gyp-lint.py.patch @@ -1,8 +1,8 @@ diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py -index fffc944d59e1fb7a075371c871c770d849af1855..145c08a327b3f3ab937627f40e746783731aae54 100755 +index 517ebbb47112568cfad411dcfa6b994a88eb19b1..e266d1fb5be6df59416eefabe44679c284c9e6d4 100755 --- a/build/android/gyp/lint.py +++ b/build/android/gyp/lint.py -@@ -526,5 +526,6 @@ def main(): +@@ -527,5 +527,6 @@ def main(): build_utils.Touch(args.stamp) diff --git a/patches/build-android-gyp-proguard.py.patch b/patches/build-android-gyp-proguard.py.patch index 2b661de0c5b..f67943803a7 100644 --- a/patches/build-android-gyp-proguard.py.patch +++ b/patches/build-android-gyp-proguard.py.patch @@ -1,8 +1,8 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py -index e75a6fffb679aabe606f5fe5219bba15666f1498..3ce7effb1398044593ac411a1092b0a2f045bae7 100755 +index 5dd433ae0bd92209bd0275e19e710c310e6e8793..cdfe28a2f8facb3f5a50bf0698adbdd838adf5a6 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -362,6 +362,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data): +@@ -376,6 +376,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data): '--pg-map-output', tmp_mapping_path, ] diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index 05d0f81c867..df69bbcf20b 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index d1a665482c989dfd92ce7fb2a2444bd9311f5513..6e170c10372bc68ad85f5d0b5032f4cf2d0755f9 100644 +index c9a3ce41465b38594c5eba3f152e4f127859ebb2..3d9c3eb009302e99c933e51435d19d7ad0d816ec 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -335,6 +335,7 @@ is_posix = !is_win && !is_fuchsia diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 7f9eeda5b53..d91419b9c72 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 c78a201b1c7c25bbd497789eea62413558bf33cd..f888184705b2ace5805c7ea6a75a4d67b749b276 100644 +index 8cf49d09545e00e9378bc1cb1c200da4d1c7c26d..1fedaf038f1b880099aaed098a503917d1805b0b 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -29,6 +29,7 @@ assert(!(incremental_install && !is_java_debug), diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index b802a1382f3..d14d119a1c1 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 2bf6060c3487a0af075f93eb1268df1185515096..9202873f9b84c9a5ea2273fc87e2ac851e6777f5 100644 +index d2a2e7cf096fdfb007391e73ffd1f7a9f4d542d9..ceb43dec608ffd298a0229e9a5001ff287a9975e 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -4167,6 +4167,7 @@ if (enable_java_templates) { +@@ -4166,6 +4166,7 @@ if (enable_java_templates) { } else { not_needed(invoker, [ "missing_classes_allowlist" ]) } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index bd28ad1d154..35ecd371c2a 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 0db0395c6619b2b544dccfed39d91cc3a350d1b8..39eb27a8ce26a7c01c7a3cb689f4b1e809df7d32 100644 +index 95c88605890462aeb97dab4dbffd80960bf1533e..4ca2fef1aa52989ead931aa6ce5e2dffb456b183 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -207,6 +207,7 @@ if (!is_robolectric && enable_java_templates) { diff --git a/patches/build-rust-cargo_crate.gni.patch b/patches/build-rust-cargo_crate.gni.patch index 175c1ca446b..9318887eb2e 100644 --- a/patches/build-rust-cargo_crate.gni.patch +++ b/patches/build-rust-cargo_crate.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni -index e5d1b2f831e6d2cfcc4b76b1afcdfce0f150cddd..018bb35898fbea42dfe495ae561a9b4c8b4c253a 100644 +index 72904511ee69f25e985aa201f7d9a47ccd0f1480..c1b2804791fa48dab0b4a468e0b6e40aa07d89c6 100644 --- a/build/rust/cargo_crate.gni +++ b/build/rust/cargo_crate.gni @@ -158,6 +158,7 @@ template("cargo_crate") { diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 830bd73ee7f..58f7d331a05 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec3673f9c6 100644 +index 6d355ce559b80b3a74292c29a548f6b8078e8b55..b1b3d5efbe11adaacd4d5c888af40d91d500ec7c 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -195,6 +195,7 @@ if (!is_android && !is_mac) { +@@ -203,6 +203,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec deps += [ ":chrome_dll", -@@ -529,11 +530,12 @@ if (is_win) { +@@ -536,11 +537,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -553,6 +555,7 @@ if (is_win) { +@@ -560,6 +562,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec if (enable_updater) { deps += [ ":chromium_updater_privileged_helper" ] -@@ -695,6 +698,7 @@ if (is_win) { +@@ -702,6 +705,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -40,7 +40,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec } } -@@ -738,9 +742,11 @@ if (is_win) { +@@ -745,9 +749,11 @@ if (is_win) { "--scm=0", ] } @@ -52,7 +52,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec if (is_chrome_branded && include_branded_entitlements) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -765,6 +771,7 @@ if (is_win) { +@@ -772,6 +778,7 @@ if (is_win) { info_plist_target = invoker.info_plist_target } else { info_plist_target = ":chrome_helper_plist" @@ -60,7 +60,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec } extra_substitutions = [ -@@ -943,6 +950,7 @@ if (is_win) { +@@ -950,6 +957,7 @@ if (is_win) { if (enable_updater) { if (is_chrome_branded) { sources += [ "//third_party/updater/chrome_mac_universal_prod/cipd/${updater_product_full_name}.app" ] @@ -68,7 +68,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec } else { sources += [ "$root_out_dir/${updater_product_full_name}.app" ] -@@ -1246,6 +1254,7 @@ if (is_win) { +@@ -1253,6 +1261,7 @@ if (is_win) { "-current_version", chrome_dylib_version, ] @@ -76,7 +76,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1427,6 +1436,7 @@ if (is_win) { +@@ -1434,6 +1443,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -84,7 +84,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1492,7 +1502,7 @@ group("dependencies") { +@@ -1499,7 +1509,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -93,7 +93,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1541,6 +1551,7 @@ group("resources") { +@@ -1548,6 +1558,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", @@ -101,7 +101,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..0b7d37698d65f6091a50124d92efe3ec ] } -@@ -1594,6 +1605,7 @@ if (!is_android) { +@@ -1601,6 +1612,7 @@ if (!is_android) { if (enable_resource_allowlist_generation) { repack_allowlist = _chrome_resource_allowlist deps = [ ":resource_allowlist" ] diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 526d351cd7c..f7bf209e738 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 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8ff534108e 100644 +index 3e0a1fe57e55843795740a337a12ea7e8ef0ba3f..221ad122b206479f9ce8b1b115331df22aa08983 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -194,6 +194,7 @@ if (current_toolchain == default_toolchain) { @@ -10,7 +10,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f } android_resources("chrome_app_java_resources") { -@@ -281,6 +282,7 @@ if (current_toolchain == default_toolchain) { +@@ -282,6 +283,7 @@ if (current_toolchain == default_toolchain) { } else { deps += [ "//components/plus_addresses/android:java_resources" ] } @@ -18,7 +18,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f } android_resources("java_overlay_resources") { -@@ -763,6 +765,7 @@ if (current_toolchain == default_toolchain) { +@@ -774,6 +776,7 @@ if (current_toolchain == default_toolchain) { ] deps += feed_deps @@ -26,7 +26,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -780,6 +783,7 @@ if (current_toolchain == default_toolchain) { +@@ -791,6 +794,7 @@ if (current_toolchain == default_toolchain) { "//components/sharing_message:sharing_send_message_result_generated_enum", "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen", ] @@ -34,7 +34,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -911,6 +915,7 @@ if (current_toolchain == default_toolchain) { +@@ -923,6 +927,7 @@ if (current_toolchain == default_toolchain) { "//components/saved_tab_groups:java", "//components/segmentation_platform/internal:internal_java", ] @@ -42,7 +42,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2286,6 +2291,7 @@ if (current_toolchain == default_toolchain) { +@@ -2311,6 +2316,7 @@ if (current_toolchain == default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -50,7 +50,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -2498,6 +2504,7 @@ if (current_toolchain == default_toolchain) { +@@ -2523,6 +2529,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,7 +58,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] } -@@ -2773,6 +2780,7 @@ if (current_toolchain == default_toolchain) { +@@ -2795,6 +2802,7 @@ if (current_toolchain == default_toolchain) { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -66,7 +66,7 @@ index 65596e0ddda636912e4018ea091a34428ffb6d65..4ff2c2cdad9d05086c727e4503274f8f # More deps for DFMs. if (dfmify_dev_ui) { -@@ -3858,6 +3866,7 @@ generate_jni("chrome_jni_headers") { +@@ -3880,6 +3888,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java", "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index ca31eb2b87a..293ed477a56 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 2ee252f69ed88aff022e81f07fbfc1c8c2cf8cf5..6e3399a98b76243f0b93bffef17497aa72d34027 100644 +index c37da0e0f8b3e8549106ded5ad22f2c45663d690..aabd7797955889dcec37c47d901140a75bbcefa8 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1212,3 +1212,4 @@ chrome_java_sources = [ +@@ -1215,3 +1215,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 8a4c97247e3..425c305fc8b 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 68a288f7471d84296958dd4870b5924cd373c9df..765d98d58a11d8c8a41282c904667aeb3fbf1aac 100644 +index 22701454051942b21cdcd6c171e37579dc6166a7..129b9806c595bfab460a1054f74b73f4c65b1ba8 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -318,6 +318,7 @@ template("chrome_common_apk_or_module_tmpl") { @@ -18,7 +18,7 @@ index 68a288f7471d84296958dd4870b5924cd373c9df..765d98d58a11d8c8a41282c904667aeb if (_is_monochrome) { proguard_configs += [ "//android_webview/nonembedded/java/proguard.flags" ] -@@ -763,6 +765,7 @@ template("chrome_common_apk_or_module_tmpl") { +@@ -762,6 +764,7 @@ template("chrome_common_apk_or_module_tmpl") { "version_code", "version_name", ]) diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index 7dd7e75dabb..e442ee7ec2a 100644 --- a/patches/chrome-android-expectations-lint-suppressions.xml.patch +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml -index a4a4ba800f9460cb3547c875f695490979a2e250..b5274cbf5da0fad858186a144a4ab7f526a39ae1 100644 +index e49e2cddb7005aabbf081b17e0f29a671802761d..0a79e777e7a2ff48d4b59a5bf7e687423c95f07a 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -289,4 +289,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md +@@ -296,4 +296,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md diff --git a/patches/chrome-android-features-tab_ui-BUILD.gn.patch b/patches/chrome-android-features-tab_ui-BUILD.gn.patch index 1083afba73f..5a9288ef02b 100644 --- a/patches/chrome-android-features-tab_ui-BUILD.gn.patch +++ b/patches/chrome-android-features-tab_ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn -index 7a8e3107bbe3426c63f74276ff2c7b5034d994b7..ef9b2edc6f03676a180fef0835e89e3260a6e2c4 100644 +index 0cd7e86e0cc30e6693df3ed341ec591fb9b62ceb..b9e67b25f29e544898460dd5cd3d580d46877ff5 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn -@@ -110,6 +110,7 @@ android_resources("java_resources") { +@@ -113,6 +113,7 @@ android_resources("java_resources") { "java/res/xml/tab_archive_time_delta_preference.xml", "java/res/xml/tabs_settings.xml", ] diff --git a/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch b/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch index bc48917d540..86e6396917d 100644 --- a/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch +++ b/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java -index 2d01fd891bb0fd057a11ec969be89f406130c7e1..463f12514f9c926ddb53f40cd79523785959a95f 100644 +index c8b8ece464e563ef37ab70429a10fb08451f5986..9d35d3e727fb0d5821492135e81507ff6bc9241d 100644 --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java @@ -301,7 +301,7 @@ public class FeedSurfaceMediator diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index a0157356457..3885ccfa476 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 0635acb3c2ff5ab80600e4e6b3fce79280366236..d3df7c9cca12ed49046a86167576f54ff77b4927 100644 +index f6ffd4c55f136aaeee1690d486b89e73a7909b43..1b6e1cbb7f3d4c94fa6bb8171161938b2e9f3295 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -28,6 +28,7 @@ by a child template that "extends" this file. @@ -66,7 +66,7 @@ index 0635acb3c2ff5ab80600e4e6b3fce79280366236..d3df7c9cca12ed49046a86167576f54f -@@ -1204,6 +1218,7 @@ by a child template that "extends" this file. +@@ -1206,6 +1220,7 @@ by a child template that "extends" this file. {% endif %} diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch index c9de76f571e..eae2ff9acba 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -index 085d1d816a86da4d63b5c7ea66759d94c833a9c6..497216b9a276369b402d6fe1efba265b562af91e 100644 +index 05fafaeb1aa2748640849838743178b7cdabe49f..536a5dad926a446c90fc8dae621d64bf2b0ad874 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -159,7 +159,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -161,7 +161,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { Action.SHARE_HIGHLIGHT, Action.REMOVE_HIGHLIGHT, Action.LEARN_MORE, @@ -11,7 +11,7 @@ index 085d1d816a86da4d63b5c7ea66759d94c833a9c6..497216b9a276369b402d6fe1efba265b }) @Retention(RetentionPolicy.SOURCE) public @interface Action { -@@ -204,7 +204,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -206,7 +206,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { int LEARN_MORE = 38; int OPEN_IN_NEW_TAB_IN_GROUP = 39; int OPEN_IN_NEW_WINDOW = 40; @@ -20,7 +20,7 @@ index 085d1d816a86da4d63b5c7ea66759d94c833a9c6..497216b9a276369b402d6fe1efba265b } } -@@ -294,6 +294,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -296,6 +296,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (!MailTo.isMailTo(mParams.getLinkUrl().getSpec()) && !UrlUtilities.isTelScheme(mParams.getLinkUrl())) { linkGroup.add(createListItem(Item.COPY_LINK_ADDRESS)); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch index 78dbb4e062f..3abc1aafa80 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java -index 433eced889ce874ebd31f6ccf048a92e543eeb17..8a159ea859a61e366080e9d8faf42666b0c2500b 100644 +index 4a1f970862e5f05741e750e03f98dd2e0addd787..6d01f18e164f34dabfec365f16c9c88dd4965b4e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java -@@ -135,7 +135,7 @@ public class NotificationPlatformBridge { +@@ -140,7 +140,7 @@ public class NotificationPlatformBridge { private TrustedWebActivityClient mTwaClient; /** Encapsulates attributes that identify a notification and where it originates from. */ @@ -11,7 +11,7 @@ index 433eced889ce874ebd31f6ccf048a92e543eeb17..8a159ea859a61e366080e9d8faf42666 public final String notificationId; public final @NotificationType int notificationType; public final String origin; -@@ -886,7 +886,7 @@ public class NotificationPlatformBridge { +@@ -891,7 +891,7 @@ public class NotificationPlatformBridge { .storeNotificationResourcesIfSuspended(notification); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index b811a442de4..d695ceeb3eb 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index 3a19b06f1fd1f09fcff6bbb05f785df7f5f2a9f5..ca509a09ddbd5733d7b6a4953bf994864edd5604 100644 +index ba86bbd08ee70b82e079fb7954f3dd4e15777b19..383a81c1d75a1998c631cf880c9105a9446a35b8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -51,7 +51,7 @@ import org.chromium.ui.text.NoUnderlineClickableSpan; +@@ -53,7 +53,7 @@ import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; /** Fragment to keep track of the all the privacy related preferences. */ @@ -11,7 +11,7 @@ index 3a19b06f1fd1f09fcff6bbb05f785df7f5f2a9f5..ca509a09ddbd5733d7b6a4953bf99486 implements Preference.OnPreferenceChangeListener { private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; -@@ -400,6 +400,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -408,6 +408,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index 3a19b06f1fd1f09fcff6bbb05f785df7f5f2a9f5..ca509a09ddbd5733d7b6a4953bf99486 MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon( -@@ -414,7 +415,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -422,7 +423,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment .show(getActivity(), getString(R.string.help_context_privacy), null); return true; } 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 56dd52e2b4c..4c9e38b7a83 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,8 +1,8 @@ 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 33c0f41cdd927021117e91efeb10a6fef1620c3b..e5163232e50d0f997b4bf4fbf79810f8ce521772 100644 +index 0e09dbed0837ec74dd3fef73f3d92555faa7156c..e76992f5ae4e9d92cc94c32ac6fc3efc3f9646ea 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 -@@ -59,7 +59,7 @@ import org.chromium.chrome.browser.ui.signin.SigninUtils; +@@ -62,7 +62,7 @@ import org.chromium.chrome.browser.ui.signin.SigninUtils; import org.chromium.chrome.browser.ui.signin.SignoutButtonPreference; import org.chromium.chrome.browser.ui.signin.history_sync.HistorySyncHelper; import org.chromium.chrome.browser.ui.theme.ChromeSemanticColorUtils; @@ -11,7 +11,7 @@ index 33c0f41cdd927021117e91efeb10a6fef1620c3b..e5163232e50d0f997b4bf4fbf79810f8 import org.chromium.components.browser_ui.settings.ChromeBasePreference; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SettingsUtils; -@@ -638,7 +638,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment +@@ -652,7 +652,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment ? ConsentLevel.SIGNIN : ConsentLevel.SYNC)); // May happen if account is removed from the device while this screen is shown. diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 66571f8d618..6e97d4d9609 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index b4fcbedc0dc5c3201789c00a2169c49c0879f879..9d38557554d8a996cbf8b91ccbf1e9c8843aa511 100644 +index 975f38ea508e497e476e952d5e49fc0ad4f41ebb..539f5f6593d4d21f6ac1f17ade23e777c2faff93 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -106,6 +106,7 @@ grit("generated_resources") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 2e4ae4e7f89..efbd6473b3d 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 20cbeaa28cb18ffabacba020fdc896b748741146..0aa114cce8e350031a056c9bbdb4d71268c6bc60 100644 +index 2b66b11333f732ea1ec65474d709b55638696cf3..16670f00624934a4506859dcbcd5125b546b3590 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2528,6 +2528,7 @@ static_library("browser") { +@@ -2516,6 +2516,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 aa3907ec314..ab14ee024b0 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 9d0181f447a1a8ef2af87164f17a7f761f1c8ce2..dc8a2865e178b9f76bb08eea01cd55b7a59df4d5 100644 +index f95f3994b3d9a310d147cffad91440f828997798..9017be64df9be5a822d2d0ef76f5f6c48020a4d4 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4216,6 +4216,7 @@ const FeatureEntry::FeatureVariation +@@ -4231,6 +4231,7 @@ const FeatureEntry::FeatureVariation // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-app_controller_mac.mm.patch b/patches/chrome-browser-app_controller_mac.mm.patch index e9325d0e7af..70cf8d3aba5 100644 --- a/patches/chrome-browser-app_controller_mac.mm.patch +++ b/patches/chrome-browser-app_controller_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm -index e1e80a20bf14f95a4ea2d37cc6e3614d683b0a9e..7edf669964b12ee8569397bbf8ba220ef628ed2f 100644 +index 390413f227e3bcb7b3842f5f864ad9b2450a2338..5b7f5d9c9d6bc1759bcfbc951aafc3762d1a310f 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -743,7 +743,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -742,7 +742,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { + (AppController*)sharedController { static AppController* sharedController = [] { @@ -11,7 +11,7 @@ index e1e80a20bf14f95a4ea2d37cc6e3614d683b0a9e..7edf669964b12ee8569397bbf8ba220e NSApp.delegate = sharedController; return sharedController; }(); -@@ -840,6 +840,22 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -859,6 +859,22 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { // Initialize the Profile menu. [self initProfileMenu]; @@ -34,7 +34,7 @@ index e1e80a20bf14f95a4ea2d37cc6e3614d683b0a9e..7edf669964b12ee8569397bbf8ba220e } - (void)unregisterEventHandlers { -@@ -1338,7 +1354,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -1357,7 +1373,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { } auto it = _profileBookmarkMenuBridgeMap.find(profilePath); diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 2bddabd7cf0..4af95fd02c5 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index c73845ee5a52ef723283ad914ab049b992caf51e..4bec2a0e48ac2dffe07b687eb38a536781fe05bc 100644 +index 9b6380d7fe36ce94b2068f02daad4deade3bb392..4dbc3d81398ffc7c809e066ea50e1362c6843210 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -242,6 +242,7 @@ class BrowserProcessImpl : public BrowserProcess, diff --git a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch index 2d756ed4930..3f490480476 100644 --- a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch +++ b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -index 497d806f19b19f4d9fe7b3544f7c692846cecb85..6ca95ebe2bb9b3d9bd281a80bee74d0328f55763 100644 +index e0f4ea6b9ee0ada184f63b9f8283a27563c95742..7a27b72e8285f840512ab54ac9b981ca250c761d 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -1643,6 +1643,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix( +@@ -1629,6 +1629,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix( return "WebrtcVideoPerfHistory"; case TracingDataType::kMediaDeviceSalts: return "MediaDeviceSalts"; diff --git a/patches/chrome-browser-component_updater-updater_state_win.cc.patch b/patches/chrome-browser-component_updater-updater_state_win.cc.patch index 97a445e090d..249809f3d05 100644 --- a/patches/chrome-browser-component_updater-updater_state_win.cc.patch +++ b/patches/chrome-browser-component_updater-updater_state_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/component_updater/updater_state_win.cc b/chrome/browser/component_updater/updater_state_win.cc -index 56f5f518937560daf34b9d475e84d72e7926e28c..930924c19b99a9a8f003bdec6386899c5a31a7fd 100644 +index 421e774aece9561f3b64189dc81efb1c35a0b70f..9629c319ef9336aa5ccd595accda45615075aa67 100644 --- a/chrome/browser/component_updater/updater_state_win.cc +++ b/chrome/browser/component_updater/updater_state_win.cc @@ -20,20 +20,32 @@ namespace { diff --git a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch index 42d6b31c9f2..8160053fa17 100644 --- a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch +++ b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -index 91f032515ec2e7a12e557c16dec91be40427c914..4a40425dbf9ba455401ab5f4d668b0b531aa0253 100644 +index 6447bd038f86a7b52f50f20c161db51879aea2f2..36f03a541c2cb2e21a75b83542794d25a7668ada 100644 --- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc +++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -@@ -171,6 +171,7 @@ void GetGuestViewDefaultContentSettingRules( +@@ -167,6 +167,7 @@ void GetGuestViewDefaultContentSettingRules( ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK), content_settings::ProviderType::kNone, incognito)); diff --git a/patches/chrome-browser-download-download_target_determiner.cc.patch b/patches/chrome-browser-download-download_target_determiner.cc.patch index 6b51028c99a..914aa587553 100644 --- a/patches/chrome-browser-download-download_target_determiner.cc.patch +++ b/patches/chrome-browser-download-download_target_determiner.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc -index 728c3ab89a592d10d2fe646c90dac0c087b8d485..56940202cd6904e6b83d3ae0001721671fd5dc36 100644 +index ccb0cb0898c4b1d784e3047473b5535acd954512..49e9f3f46f4eff02dbb25362f73d7e67511a9c04 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1348,6 +1348,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1300,6 +1300,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP; if (HasPromptedForPath() || confirmation_reason_ != DownloadConfirmationReason::NONE || @@ -10,7 +10,7 @@ index 728c3ab89a592d10d2fe646c90dac0c087b8d485..56940202cd6904e6b83d3ae000172167 user_approved_path) { return DownloadFileType::NOT_DANGEROUS; } -@@ -1387,6 +1388,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1339,6 +1340,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || (download_->HasUserGesture() && visits == VISITED_REFERRER))) return DownloadFileType::NOT_DANGEROUS; diff --git a/patches/chrome-browser-download-internal-android-BUILD.gn.patch b/patches/chrome-browser-download-internal-android-BUILD.gn.patch index 44bc782ffab..ffd9468f37a 100644 --- a/patches/chrome-browser-download-internal-android-BUILD.gn.patch +++ b/patches/chrome-browser-download-internal-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/internal/android/BUILD.gn b/chrome/browser/download/internal/android/BUILD.gn -index 6182397fe2d9575dea6b955816c678dd1308c770..3b0349b430e528c5a64a171e2a7a4526a1041f52 100644 +index 89959608be066a43d37fbe1f0b245aea2c0f7f6f..00a9637e40b6833fc0d23063b65ac2f3e7d2bee9 100644 --- a/chrome/browser/download/internal/android/BUILD.gn +++ b/chrome/browser/download/internal/android/BUILD.gn -@@ -199,6 +199,7 @@ android_resources("java_resources") { +@@ -200,6 +200,7 @@ android_resources("java_resources") { "java/res/values/ids.xml", "java/res/values/styles.xml", ] diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 80214ad557e..bb9af1c6dc2 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 3590fc2a9fd72ec0de5f9b51939940529b2598d9..50554db0b8d34109f0a6d4341d3f006cfed4d08c 100644 +index 3297c631e40aa95ed19907dd89f3cc1204e6c5b8..b5ccfb47f15069c10b4d14aa515e8d78d1952535 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1576,6 +1576,7 @@ source_set("extensions") { +@@ -1543,6 +1543,7 @@ source_set("extensions") { "//components/enterprise/data_controls/core/browser", ] } diff --git a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch index 903ec324f13..a578d138249 100644 --- a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch +++ b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -index 5ecdd92879f582f76aeabf3a297c90c4a515c988..e0e13647f0a7761f8aae7c253ec76d76ad2f8193 100644 +index 3b28400ef1a8ef85df77689925d8c3e727b2c408..4de06c2f72c6ece8aeb714393daee344eeb05d59 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -671,6 +671,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( +@@ -677,6 +677,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension); info->incognito_access.is_active = util::IsIncognitoEnabled(extension.id(), browser_context_); diff --git a/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch b/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch index e68aa7808e8..8793b58d94b 100644 --- a/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch +++ b/patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc -index ef837fc75da354ceea89f221637a967bee273966..6882b5572b0e6738daf3e6769d176f8615087994 100644 +index b57fd80c4b9a95b2c8d9bdadccc9de8cab9e2cea..cd1addad287b86fbfd07b86f8ad0b323afa69e7a 100644 --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc -@@ -185,6 +185,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() { +@@ -186,6 +186,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() { // From here on out, results must be returned asynchronously. StartAsyncRun(); @@ -10,7 +10,7 @@ index ef837fc75da354ceea89f221637a967bee273966..6882b5572b0e6738daf3e6769d176f86 // TODO(crbug.com/40614113): collapse the asynchronicity content::GetUIThreadTaskRunner({})->PostTask( FROM_HERE, -@@ -339,12 +340,14 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() { +@@ -340,12 +341,14 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() { void IdentityGetAuthTokenFunction::StartMintTokenFlow( IdentityMintRequestQueue::MintType type) { #if !BUILDFLAG(IS_CHROMEOS) diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch index ee24d4b1f40..d54eb132a9f 100644 --- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch +++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc -index c63043102268812059c11bdb2ec3def61606fe0b..82f619d46409af7d724fa7c6c7aeb4cfd6bfc1ac 100644 +index 1687e36dd5966b67fad971fc895ebbbe63b57775..0f404e573b99ea64798a295b9a042b91a73d038b 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc -@@ -887,6 +887,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { +@@ -996,6 +996,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { } if (!url.SchemeIs(content::kChromeUIScheme)) { diff --git a/patches/chrome-browser-net-profile_network_context_service.cc.patch b/patches/chrome-browser-net-profile_network_context_service.cc.patch index 6d254cba65e..da198b5aff4 100644 --- a/patches/chrome-browser-net-profile_network_context_service.cc.patch +++ b/patches/chrome-browser-net-profile_network_context_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc -index 46a04e805fe78d114b44c7de71822740452eb71b..c86d0213167f07a84836bae25a7aac6a28d700ef 100644 +index 718110bc6d60dfc55ac35cfc316844e1bb19fcb4..51a342c2481f49900bdd521a855a645a7637de6e 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -496,6 +496,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() { +@@ -507,6 +507,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() { std::vector excluded_spkis( TranslateStringArray(ct_excluded_spkis)); diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch index 63aec4899f9..cdd48a44cfe 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 249ff5ecffa8df9d9f545cc9cbed9a39b78f1e77..0ba7b50dfc23f3089c86a4505c9504cdaba8ebda 100644 +index afb5ce8d83b05645a19649bfe8bbdfe4512b33fe..4c341ecd0e7f9b193f972a05b1d411ad8d4a2797 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -405,7 +405,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem +@@ -406,7 +406,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem if (!manager_) return; manager_->GetURLLoaderFactory()->CreateLoaderAndStart( diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index a29b6dc0648..deeaa93ca9e 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 812bb38a0c53e8759138fbb34936f2112341f001..0c94fdd6828a7e628c901e1ac80fcf59fb5a1d8b 100644 +index e408ae181c2eb10a25a9beaf8155e1e5ce068a14..e64435007ced58ce856e771d900417eae7938901 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1783,6 +1783,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1853,6 +1853,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kQRCodeGeneratorEnabled, true); // This is intentionally last. @@ -10,7 +10,7 @@ index 812bb38a0c53e8759138fbb34936f2112341f001..0c94fdd6828a7e628c901e1ac80fcf59 RegisterLocalStatePrefsForMigration(registry); } -@@ -2223,6 +2224,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2295,6 +2296,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, registry->RegisterDictionaryPref(prefs::kReportingEndpoints); registry->RegisterBooleanPref(prefs::kCompactModeEnabled, false); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 01623170cd3..81fc6b6aac0 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index e2db3688e3e0b11b51418b0c011541333d3c8d5d..8ee9cc6a3e26f99ee543c2bea14921d6156ba36c 100644 +index 76e435416e7ca956468ccbf9c222547d9e75dcaa..f426a199ce2f58f7c3b7193574c277fb5082a5ef 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -111,6 +111,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { 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 d14f2ddb488..2b1e1ca25bf 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,8 +1,8 @@ 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 aad2abb0c249a786e09d7923662bd02ff7346303..6217364f45bb4ef58d1d0cc7206d195f40102fcc 100644 +index aa0d1cc1d45fe17eb59ecceb5dd1f8a1594012a9..f0a508b0085cb149b694ade347c271dfe06bff81 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2416,6 +2416,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -2411,6 +2411,7 @@ void RenderViewContextMenu::AppendSearchProvider() { if (!selection_navigation_url_.is_valid()) { return; } 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 7e84f291aaf..78bac18e9d0 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 f3abb9c4164f3db5c0a626d7187b6d6a6c81ef1f..0437fb2ec334c5262fc66fa870270f67ab3f9d09 100644 +index 91de5780521af73eb8b41969562ac1c04a23a47f..fd6fc90ac45780e78a117624179268d3434d3191 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -198,6 +198,7 @@ class RenderViewContextMenu diff --git a/patches/chrome-browser-resources-downloads-BUILD.gn.patch b/patches/chrome-browser-resources-downloads-BUILD.gn.patch index 90e343fb5c5..7f7e26f9354 100644 --- a/patches/chrome-browser-resources-downloads-BUILD.gn.patch +++ b/patches/chrome-browser-resources-downloads-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/downloads/BUILD.gn b/chrome/browser/resources/downloads/BUILD.gn -index 2710b74603e0e63a29a4dd559bfbe1a3b6b8f925..17dace431af9b6094b74fb3493d1c6ecab52a98c 100644 +index 9e9169da0931a577476fe6367be9bd368b631373..e97ba9bc9973680d147ca3215c8ebfff47e1dc37 100644 --- a/chrome/browser/resources/downloads/BUILD.gn +++ b/chrome/browser/resources/downloads/BUILD.gn -@@ -60,4 +60,5 @@ build_webui("build") { +@@ -76,4 +76,5 @@ build_webui("build") { optimize_webui_host = "downloads" optimize_webui_in_files = [ "downloads.js" ] } diff --git a/patches/chrome-browser-resources-downloads-downloads.ts.patch b/patches/chrome-browser-resources-downloads-downloads.ts.patch index 6f58c178737..feb9366f03e 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 42bc42a6d52b44caf3ac344cda06cfb3b0554c89..259033713a94b4295a931fad6c8c3cc14c98f09c 100644 +index f4036a3479f94b642164ac1c52b7c037389fae95..3287be58d54c34a097a1b8e404d11bed8171aa0c 100644 --- a/chrome/browser/resources/downloads/downloads.ts +++ b/chrome/browser/resources/downloads/downloads.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-extensions-extensions.ts.patch b/patches/chrome-browser-resources-extensions-extensions.ts.patch index bafbe34bdf0..de3a6bc5d12 100644 --- a/patches/chrome-browser-resources-extensions-extensions.ts.patch +++ b/patches/chrome-browser-resources-extensions-extensions.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/extensions.ts b/chrome/browser/resources/extensions/extensions.ts -index 3f37503e693dd5ddd0d2e25ebd246ca25766d189..6c2d913a8aecb472f4db6e15511fce2b04da4b64 100644 +index 0c026efc93e789ba9327dd02c90dc4de51b451b0..4e309238b2e14667687df886f561e9a94a3da12b 100644 --- a/chrome/browser/resources/extensions/extensions.ts +++ b/chrome/browser/resources/extensions/extensions.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 66cb0ba4de9..b655dae90d1 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index bdaea9d23f407d95abe9611dc5087fe984a384d6..103f35c9c086868c548ed1c6337271dafce8e1fa 100644 +index 5ecfd08141976b2b4fdd3aa878d62c2973e45ba9..58cfc9ffab81ccc4ce0ba87c614daf0428d9833f 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -466,4 +466,5 @@ build_webui("build") { +@@ -451,4 +451,5 @@ build_webui("build") { "$root_gen_dir/chrome/browser/resources/settings_shared/tsc", root_build_dir) ] } diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index 6b72764d7aa..c12fad7aee6 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 8216af356f4f92697478aa1350b422692e96cd75..62f85033039c8b89e9cb53d3d992552559464437 100644 +index 3edf3a7f146129e487e01a03b697f4c60d565063..98c8b6884b20536aa2b96c4ffb86b0865470e06a 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -36,6 +36,7 @@ @@ -10,7 +10,7 @@ index 8216af356f4f92697478aa1350b422692e96cd75..62f85033039c8b89e9cb53d3d9925525 @@ -18,7 +18,7 @@ index 8216af356f4f92697478aa1350b422692e96cd75..62f85033039c8b89e9cb53d3d9925525 diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index d9ab1f0aa30..19e52a21a97 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index 0113ecac75bc993fef343011b026982700781dfe..8fea17b6593d6788e6283d9cfed8575ebb895385 100644 +index 287dd67692105fcf52194989e644814075170f4b..64a511e43d8da6988787acd065acf24520e378aa 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts @@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js'; diff --git a/patches/chrome-browser-resources-settings-router.ts.patch b/patches/chrome-browser-resources-settings-router.ts.patch index 4bdf31abc88..1fc21a3bb83 100644 --- a/patches/chrome-browser-resources-settings-router.ts.patch +++ b/patches/chrome-browser-resources-settings-router.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts -index 7e03316d8975291611bb095bd3b87c5133f1e33b..ffe04f2f3c6602c6d12434715568c69a9aebe1c3 100644 +index 1fb0b38fef0dcee31015a939fd31202e0294bca7..3abf7c2b1083ad32841b1ef5064da971f6ab1fb7 100644 --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -118,6 +118,7 @@ export interface SettingsRoutes { +@@ -120,6 +120,7 @@ export interface SettingsRoutes { IMPORT_DATA: Route; SIGN_OUT: Route; // diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index a713fe819ca..626bff70079 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index a254cba81acb3f2b9105bd7bf8f550f3183e616c..59500c0a172ce3df6962fc036a67684533c123da 100644 +index 585035dcc577fdc068df718f3fa14ff4cc62cc0f..926fffe8083772470e52bf3960ab5a4ba5c71662 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_shared.css.patch b/patches/chrome-browser-resources-settings-settings_shared.css.patch index f10bdc32dce..430ffcbfbae 100644 --- a/patches/chrome-browser-resources-settings-settings_shared.css.patch +++ b/patches/chrome-browser-resources-settings-settings_shared.css.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings_shared.css b/chrome/browser/resources/settings/settings_shared.css -index f5952ec653bec5b4934cf18ee224f51b067b0dee..db474bf31e5f65b2f29b2055816121c79ad2a979 100644 +index 009cd5cf423be1c0bacdcb264065782b6878e71c..a0a2cb915e9fe4e3fe8188367a858eff38134999 100644 --- a/chrome/browser/resources/settings/settings_shared.css +++ b/chrome/browser/resources/settings/settings_shared.css @@ -8,7 +8,8 @@ diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index d6daa616ed3..f9b0bc8e41e 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index baa078662b99c3fb3574f0eaa19d8f1938b20768..3c42a8f67617eedeb63ecffd72b0763fd569966a 100644 +index 4ed920a8aabf9a853713935ffaa6653a8e1360b0..0c9e64bc05960754cdbcbc7bdcf118e292586b01 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts -@@ -64,6 +64,7 @@ export enum ContentSettingsTypes { +@@ -67,6 +67,7 @@ export enum ContentSettingsTypes { PDF_DOCUMENTS = 'pdfDocuments', SITE_DATA = 'site-data', OFFER_WRITING_HELP = 'offer-writing-help', diff --git a/patches/chrome-browser-resources-settings-site_settings-settings_category_default_radio_group.ts.patch b/patches/chrome-browser-resources-settings-site_settings-settings_category_default_radio_group.ts.patch index fe84a5318f5..7ccb9a69cf8 100644 --- a/patches/chrome-browser-resources-settings-site_settings-settings_category_default_radio_group.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-settings_category_default_radio_group.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts -index 315007f91cab8851fb7b7cb256f14db1f953032e..d3b87ab945518e4c76c2af4b6db3aeb42944b858 100644 +index f41407671c3aa79854cbf4c4adf5359278ea5f60..fa73ea59476b32d9feefe73c728f69c80669e848 100644 --- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts +++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts -@@ -168,6 +168,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends +@@ -171,6 +171,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends case ContentSettingsTypes.WEB_PRINTING: // "Ask" vs "Blocked". return ContentSetting.ASK; diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch index 184a8ede689..a2b65f88964 100644 --- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index bb66d4a7d7695eba0e3568295e4bf3124045d1ae..77ad2ee82e209555d1c4f8dff81c5b559fb8cfe1 100644 +index a42f9b0e0ed2b752599a93e1c36e42457214a0f6..4e7a5019cf9fada7bff66dead8a0ce857101b4c5 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -8,6 +8,7 @@ diff --git a/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch b/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch index 467f9824dc1..1df4eb5328f 100644 --- a/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch +++ b/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/side_panel/read_anything/BUILD.gn b/chrome/browser/resources/side_panel/read_anything/BUILD.gn -index 752798e50a7635c26a112bb2d266bbabd4edb6c3..8f8234fb181d65e22380ee46afeed1a713631d6a 100644 +index d359c56e3443c7ee8b5d17688fa3dbdf77c3eefc..38e7ac4b8a20841f843135955010b0254eba0b13 100644 --- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn +++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn -@@ -57,7 +57,7 @@ build_webui("build") { +@@ -65,7 +65,7 @@ build_webui("build") { target_gen_dir) ] webui_context_type = "untrusted" diff --git a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch index 9987e140dad..c7357f436f5 100644 --- a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch +++ b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -index ba02f2d5590e04db85135eb29216f0a3b967eb55..cfb671ffba84197012d0d2975ed5d185172be576 100644 +index 8ba985a855a17fbd3846e77a49760fbacbda8d71..a425f09679ceaa247e32f23aa335400c54672cd3 100644 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc @@ -325,6 +325,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt( diff --git a/patches/chrome-browser-themes-theme_service_factory.cc.patch b/patches/chrome-browser-themes-theme_service_factory.cc.patch index d9ddc476264..dc24774dd2a 100644 --- a/patches/chrome-browser-themes-theme_service_factory.cc.patch +++ b/patches/chrome-browser-themes-theme_service_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc -index 0c2dd7d8c25456620ea22e748121e03e8a547d5f..18b9e8d30fd9899452c7daaf8b34e9d54fb63076 100644 +index 55d7ce0e353a1e5d7e3c230a58e10b9735b1d50f..3a9078c058fcd4385b8325751021cab8c045b735 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc @@ -106,6 +106,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; diff --git a/patches/chrome-browser-ui-actions-chrome_action_id.h.patch b/patches/chrome-browser-ui-actions-chrome_action_id.h.patch index a050c4a055b..ffb69af99ab 100644 --- a/patches/chrome-browser-ui-actions-chrome_action_id.h.patch +++ b/patches/chrome-browser-ui-actions-chrome_action_id.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/actions/chrome_action_id.h b/chrome/browser/ui/actions/chrome_action_id.h -index b458fd71e79136f5850599ac2637011301088a8d..8c1667aeecabcefb6e225175af258374e98fbf62 100644 +index f36a6ecbca4ba9f6396c9c85e71ad2f946aeb01a..e7daabc52cc33e69c2c5b7319bdaf3e4cab46885 100644 --- a/chrome/browser/ui/actions/chrome_action_id.h +++ b/chrome/browser/ui/actions/chrome_action_id.h -@@ -541,6 +541,7 @@ +@@ -540,6 +540,7 @@ /* Side Panel items */ \ E(kActionSidePanelShowAboutThisSite) \ E(kActionSidePanelShowAssistant) \ diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index bf64554fd87..b69f33ad6c4 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index ce1b3b257a3fbee98ced527222d25f05d5c9051c..12d4dd65e9de25d06f9d71c5f9d97407582135fa 100644 +index 1f40d76224d521b64894ec51167ee6d2f9eea30e..9be6d36701a1a08a2602eae795e9f5d477e751c5 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -105,6 +105,7 @@ android_library("java") { +@@ -107,6 +107,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java", "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java", ] diff --git a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch index ce008b757f8..d3697c25abd 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml -index d109456fca6775a88a3d39947086cd69a9495a2d..a4e955c78d431c8c14f547ee07253896c15b1ed5 100644 +index b42cdce90f03672094a77f16004064b17e8e446f..5edb2ef910e81e74a18d86df020c950b96696a69 100644 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml @@ -66,6 +66,7 @@ found in the LICENSE file. diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index ba0e8b5b5e8..7e9b5421ab3 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 2a59309693e63f416054ea838d02c70a5552e7f7..2114ed1a8efa51f00fa20c3f3f90c08a571831c5 100644 +index aeac917409efa2f452d95b17af915170c2d91153..47aa4520ac819933f3bbca3c4cfea444e1cf581f 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -429,6 +429,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -435,6 +435,7 @@ public class ToolbarPhone extends ToolbarLayout if (mOptionalButtonCoordinator != null) { mOptionalButtonCoordinator.setBackgroundColorFilter(color); } @@ -10,7 +10,7 @@ index 2a59309693e63f416054ea838d02c70a5552e7f7..2114ed1a8efa51f00fa20c3f3f90c08a } private void updateModernLocationBarCorners() { -@@ -583,6 +584,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -589,6 +590,7 @@ public class ToolbarPhone extends ToolbarLayout mTrackerSupplier.get().notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -18,7 +18,7 @@ index 2a59309693e63f416054ea838d02c70a5552e7f7..2114ed1a8efa51f00fa20c3f3f90c08a } @Override -@@ -1041,6 +1043,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1047,6 +1049,7 @@ public class ToolbarPhone extends ToolbarLayout * Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { @@ -26,7 +26,7 @@ index 2a59309693e63f416054ea838d02c70a5552e7f7..2114ed1a8efa51f00fa20c3f3f90c08a TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); if (isInTabSwitcherMode()) return; -@@ -1420,6 +1423,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1426,6 +1429,7 @@ public class ToolbarPhone extends ToolbarLayout canvas.restore(); } @@ -34,7 +34,7 @@ index 2a59309693e63f416054ea838d02c70a5552e7f7..2114ed1a8efa51f00fa20c3f3f90c08a // Draw the tab stack button and associated text if necessary. if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) { // Draw the tab stack button image. -@@ -2100,6 +2104,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2106,6 +2110,7 @@ public class ToolbarPhone extends ToolbarLayout } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index b08c0698058..31487b5d0e3 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index a78210e6c74c4c6a9d7f1cf484ab2fd3ad77df64..1bcb9344df74fb16aea007caa41b0e1145acd3de 100644 +index a158d0d3652ade968a504548fa220176bea8299b..80f08d4d1b13df0569a24b8a2de4b4da6316cf32 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -@@ -410,10 +410,12 @@ public class ToolbarTablet extends ToolbarLayout +@@ -439,10 +439,12 @@ public class ToolbarTablet extends ToolbarLayout mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } @@ -15,7 +15,7 @@ index a78210e6c74c4c6a9d7f1cf484ab2fd3ad77df64..1bcb9344df74fb16aea007caa41b0e11 String description = null; Context context = getContext(); Resources resources = context.getResources(); -@@ -552,6 +554,7 @@ public class ToolbarTablet extends ToolbarLayout +@@ -582,6 +584,7 @@ public class ToolbarTablet extends ToolbarLayout mLocationBar.getTabletCoordinator().tintBackground(textBoxColor); mLocationBar.updateVisualsForState(); setToolbarHairlineColor(color); diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 7f5ee069caf..5714c5ec994 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index dc07c5029aa49bffa650af0b61ea827c04c0f7a7..d4b1990a51b4a7f61492b7aa4fad6eb7fddd7622 100644 +index e1ebde9b491c38cdf0bc6f574e78ac72aa997c66..757564b8cfc0e05702da4030823ba5183d7f06e1 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -529,6 +529,7 @@ Browser* Browser::Create(const CreateParams& params) { diff --git a/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch b/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch index 21ad2c232e2..6b3a92a9ace 100644 --- a/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch +++ b/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.h b/chrome/browser/ui/omnibox/chrome_omnibox_client.h -index 1134f8834ed188e9b48401f0f12e240ef3813d05..63471c84697a8eaf3948b3b08e5b873ff4139ec6 100644 +index ecd15f6fcd2a2d713f9f688477d07524a2f53386..1b27de5cf6fe2305a4834f7f1c38631a34fe5e70 100644 --- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h +++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h @@ -23,7 +23,7 @@ class GURL; diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 4554079c7dd..79185142114 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index bc81c5a0b9088a86a70a1dd7fd5fc6b049614384..55be39554575b2899c5100150132408a43653c6d 100644 +index b7dacc2a46e5351d265fe36321460b50c3f3d3ef..fd76360663de51fdecd57d759f7d2bab19a091fc 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -814,4 +814,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -828,4 +828,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch index 0ae46e0f99b..4423a162994 100644 --- a/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc -index e6fcc7d37a0accdd77ed453d5a55ed6d3dfb8e48..31f08fdd95b935b5d7f283347ead092e838ab82f 100644 +index f31ce671fe77c84a1469e49355dccca377052bae..a951b599bd49187abd61945e3fd46a8c2761d321 100644 --- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc @@ -444,6 +444,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index a2134e0a20c..c91e74de2b9 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index 2733d84a065e98f48fa048f2da12360819f661c2..6cb884ecb8a8d3a5ca19ee563158322dd5e18b8c 100644 +index 4d900c4a7f58c8ed0e68e4f890b2f79484ad89dc..0d2f081f130a7c7f33db2a0f020d28afff8c683d 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h @@ -660,6 +660,7 @@ class TabStripModel : public TabGroupController { diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index d11e3d84597..b6c9b1f5516 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index d039a787c2bf4f555eb5aa03c317fc2e7a3fd614..5ae533772cac1d013113b7c2014f35cb6a5b3877 100644 +index 9cecb25b41d3b6ac27c11f3c76d655b40c513a57..adcbad9b2896f5b1374003417b17ac382dc82a33 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -881,6 +881,7 @@ void BookmarkBarView::Layout(PassKey) { diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch index bd333add718..60e5e29a483 100644 --- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch +++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h -index dc691e4bd087509773ad61d7ee4ed03e1c3b55df..6e1bde9235b28c860c57329e2668699bce92ef89 100644 +index 08f43b0b4dfd09d7bb36f4f210237ec0e9b2e3a8..14da201eccc29eb9437143664bb3212bbc4b0135 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h -@@ -115,6 +115,7 @@ class DownloadItemView : public views::View, +@@ -114,6 +114,7 @@ class DownloadItemView : public views::View, void OnPaintBackground(gfx::Canvas* canvas) override; void OnPaint(gfx::Canvas* canvas) override; void OnThemeChanged() override; diff --git a/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch b/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch index b9a23284e54..e60b56768dd 100644 --- a/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc -index da5d38532531bc86c8107e7edbf85299aa35536e..edae27bffb231d02be53485715fd1c9645a16590 100644 +index 9a08b9d0a91bc624c3a7736e80d2016aa70faf30..e8f0bdb434e5cf8f1e8ee11322e244be95bcdab7 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc -@@ -678,6 +678,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem( +@@ -718,6 +718,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem( ExtensionMenuItemView::SitePermissionsButtonAccess site_permissions_button_access, int index) { diff --git a/patches/chrome-browser-ui-views-extensions-extensions_menu_view_controller.cc.patch b/patches/chrome-browser-ui-views-extensions-extensions_menu_view_controller.cc.patch index ae385f5c2ef..9ddbe0baac5 100644 --- a/patches/chrome-browser-ui-views-extensions-extensions_menu_view_controller.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extensions_menu_view_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc b/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc -index de634967cf45a731acc4ec4d7fb0abad7ff7d5ff..e94d1ef550c33248f6fef9ec02685e064a4df335 100644 +index 978d23e01af7e16c3b35c6d6fc80ff7d7dfe84cb..daa9730713794591f01b36e16331ad1044d1acd5 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_view_controller.cc @@ -337,6 +337,7 @@ ExtensionsMenuViewController::~ExtensionsMenuViewController() { diff --git a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch index 50fd305e6b6..b617e29d45c 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -index b7c3928a1c2850c562525246a4394d18662b91bf..b51eb93e267a70951ff7342ec7c80f0e20be0c21 100644 +index cb67a94e2cb331c8a0f13ac56565920afd487799..b58e5304c775590f5e58cedc6e160cc318516dd6 100644 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -424,6 +424,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -446,6 +446,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( icon = &gfx::kNoneIcon; switch (info.type) { diff --git a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch index 2de1f958a60..a15a703c27c 100644 --- a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch +++ b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -index 59263f44edd41ba2f20ec1bf8505b393e80d874d..3921566a6eeada482b3e471ce0d8700579d5ee27 100644 +index 2a4cd2fe1736ac3b6fa53c68dc4da5fd369aa118..45b76cf57b892ed8d8f49b0949a02870ff9301fd 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -@@ -155,6 +155,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( +@@ -156,6 +156,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( SetButtonStyle(ui::mojom::DialogButton::kOk, ui::ButtonStyle::kTonal); SetButtonStyle(ui::mojom::DialogButton::kCancel, ui::ButtonStyle::kTonal); } diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch index f605bbe6eb4..d6b3cc7493a 100644 --- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch +++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -index e4a446320466bf1d5553ed1436f26907bcd2f358..568a3f3406af2aa2e5ea3a103d841c923c27c5f0 100644 +index 26c914fcaee4ad496afcdbcdd0425576660c7877..cb2d40ef517c1f2b6b62e7ff20e197f56205b0ca 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -149,6 +149,7 @@ class AvatarToolbarButton : public ToolbarButton { +@@ -153,6 +153,7 @@ class AvatarToolbarButton : public ToolbarButton { CreateScopedZeroDelayOverrideSigninPendingTextForTesting(); private: diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.cc.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.cc.patch index 7d80e3f0080..85feb9b9b66 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.cc.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc -index cbc806f09f40cf81cde2a65d2aa3d86beba27d38..2ec996ab4ecafcdad9b35471b04c3efa0f212f0d 100644 +index 06d73cdced8d99fe3a174438de737f07a37f4b19..cc51817df5bfe1a1005cefcc6267026250bd9245 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -609,6 +609,7 @@ void ProfileMenuViewBase::BuildProfileBackgroundContainer( +@@ -589,6 +589,7 @@ void ProfileMenuViewBase::BuildProfileBackgroundContainer( identity_info_color_callback_ = base::BindRepeating( &ProfileMenuViewBase::BuildIdentityInfoColorCallback, base::Unretained(this)); diff --git a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch index fd9973af8d3..036033083ac 100644 --- a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc -index 0eab548399b76352a2c098c5938b2f51271261aa..3a1162a5879c7f1bab398b0ab48e94862fed489b 100644 +index 0bfb3454d827ac708205dc654bef8c86efcb6638..4ed223e8acb12494eb55c0bffd72d70e0089566f 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc -@@ -125,6 +125,7 @@ void SendTabToSelfDevicePickerBubbleView::Init() { +@@ -126,6 +126,7 @@ void SendTabToSelfDevicePickerBubbleView::Init() { CreateHintTextLabel(); CreateDevicesScrollView(); diff --git a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch index 8ab14f3acc1..4c747826d15 100644 --- a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch +++ b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h -index 46a00435550e612a2e3dd3065bdde2a1f50fc2ce..d108a2e5ce28e24f4f142459a5bbe6d6da6a3eee 100644 +index 9b41960c2811e32def94cca9eae5c9b60867a4cf..56ea086ab0d3144858ee4199fa24eae2ce50e319 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h -@@ -52,7 +52,7 @@ class View; +@@ -55,7 +55,7 @@ class View; // registry's active_entry() then global registry's. These values are reset when // the side panel is closed and |last_active_global_entry_id_| is used to // determine what entry is seen when the panel is reopened. diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index 9b8e6c4d5ca..2600e2c4c0b 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index 7a9b5480df203be15d253b15636afeb88cde44fc..3845d1d53f8cae218403922b3590e207d9af0e60 100644 +index 30ec5058583eda239a356803dcfddb265263c501..272263582b91d168bb44b6163e6b7b7755b26330 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -324,6 +324,7 @@ void Tab::Layout(PassKey) { @@ -18,7 +18,7 @@ index 7a9b5480df203be15d253b15636afeb88cde44fc..3845d1d53f8cae218403922b3590e207 } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -1107,6 +1109,7 @@ void Tab::UpdateIconVisibility() { +@@ -1105,6 +1107,7 @@ void Tab::UpdateIconVisibility() { !controller_->IsLockedForOnTask() && #endif large_enough_for_close_button; diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index 4065d687603..75b428114c6 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index a247d2f2df14236d8980bd4b4aadb52fe4d2318c..c502d778784f098a9804a1ec73026ccb447d8e28 100644 +index e3571bf5261a2fb413ee29db412776792c0a5a28..c203bacce67a47bf22568e807ef2383061258751 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -546,6 +546,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, 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 b2ebe1682cf..9edfe5798c7 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 af6d877f601d2bccd579578c10a3349af76ddff8..566d5286298eaec1568aa0a2183966b3314c5590 100644 +index 743fd86a35a106d98c8553e20a63e20127bc3f98..c4796015433ec5886a7bd2ac243a4e3a4bb3c12c 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -842,6 +842,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -789,6 +789,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index 4c57edd7666..872bd54a9e8 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 967f0cf3a1bc9f5989a9880f2b4197b79b365792..7431d63d4e84b66974d1a83cd5d947e560891da7 100644 +index 6e8b117acb7beafbb5e358cbc9cd24d4cefb2eae..b68d99622aa9ce5866a796810db5f6a6ed675699 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -493,7 +493,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -494,7 +494,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, source->AddBoolean("isLacrosEnabled", crosapi::browser_util::IsLacrosEnabled()); #endif diff --git a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch index 8267394e6f1..b5bb889fe6f 100644 --- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc -index 03070f349a2f3247195a2606e6bf38682836dfe2..4327a60333348df0cdfb9fe8b1d450dd9cac3ce8 100644 +index 03498e5e09b90e8848d1c59e55a4de040d26946e..79233a3c96432601e822fe903fb8a2ab365379e7 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc @@ -90,6 +90,7 @@ content::WebUIDataSource* CreateAndAddHistoryUIHTMLSource(Profile* profile) { diff --git a/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch b/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch index ea9ec7e93c1..8d507718d5c 100644 --- a/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc -index cb63da1fa1cba18f6a789d9d871f7e548290a9f2..c5f3bdb31c012473e20d057f8089af1ad171ef32 100644 +index 7b7f7330a30e39cb384d156609446df18ae3114f..ef054a694317045cfbcacbc814b9f88b1f79b61b 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -154,7 +154,7 @@ PrintPreviewRequestIdMap& GetPrintPreviewRequestIdMap() { 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 12fdba4d9c6..736dbf7cdff 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 f1fa3f5076cedc913a00b3927aea2391b931486b..616ad341bdb7abc7c247c53aaf214f132442744d 100644 +index f55f05b9b7db0d30260b718111ed9e7bf6699896..4a7575015950cadb6ca8d2f1b41693161931b3b0 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3746,6 +3746,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3683,6 +3683,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index d0c66296af3..ce7dde347b8 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 6ac41c94ddaa8e94154c07deef1a94ab7980f247..7eb0d7b2451cab74281c667f55bcfd2fc5a47e70 100644 +index d34354c29d963cded0b9ac480847b00a31391df7..91896187382590c4ae3a69acdf98ffa5d57bd4e3 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -245,6 +245,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { +@@ -244,6 +244,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { {ContentSettingsType::TOP_LEVEL_TPCD_ORIGIN_TRIAL, nullptr}, {ContentSettingsType::DISPLAY_MEDIA_SYSTEM_AUDIO, nullptr}, {ContentSettingsType::STORAGE_ACCESS_HEADER_ORIGIN_TRIAL, nullptr}, @@ -10,7 +10,7 @@ index 6ac41c94ddaa8e94154c07deef1a94ab7980f247..7eb0d7b2451cab74281c667f55bcfd2f }; static_assert( -@@ -487,6 +488,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -486,6 +487,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { @@ -18,7 +18,7 @@ index 6ac41c94ddaa8e94154c07deef1a94ab7980f247..7eb0d7b2451cab74281c667f55bcfd2f for (const auto& entry : kContentSettingsTypeGroupNames) { // Content setting types that aren't represented in the settings UI // will have `nullptr` as their `name`. However, converting `nullptr` -@@ -501,6 +503,7 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { +@@ -500,6 +502,7 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { } std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) { @@ -26,7 +26,7 @@ index 6ac41c94ddaa8e94154c07deef1a94ab7980f247..7eb0d7b2451cab74281c667f55bcfd2f for (const auto& entry : kContentSettingsTypeGroupNames) { if (type == entry.type) { // Content setting types that aren't represented in the settings UI -@@ -676,6 +679,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) { +@@ -679,6 +682,7 @@ std::string SiteSettingSourceToString(const SiteSettingSource source) { SiteSettingSource ProviderTypeToSiteSettingsSource( const ProviderType provider_type) { switch (provider_type) { @@ -34,7 +34,7 @@ index 6ac41c94ddaa8e94154c07deef1a94ab7980f247..7eb0d7b2451cab74281c667f55bcfd2f case ProviderType::kWebuiAllowlistProvider: return SiteSettingSource::kAllowlist; case ProviderType::kPolicyProvider: -@@ -702,6 +706,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource( +@@ -705,6 +709,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource( std::string ProviderToDefaultSettingSourceString(const ProviderType provider) { switch (provider) { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index dff6eb51bda..53dcc8c90a9 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 bb07b24fe6baeace445cbc3419112127a67a1ba3..b62d0014539e1890693d7ab84a3d5a77a7fc3c88 100644 +index 830aa518d192fb9bc365f207cdd1f0e6c659fe56..20593b66255884482ea9f43c6bab1a5787fe52a4 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -100,6 +100,7 @@ source_set("channel_info") { @@ -18,7 +18,7 @@ index bb07b24fe6baeace445cbc3419112127a67a1ba3..b62d0014539e1890693d7ab84a3d5a77 if (enable_extensions_core) { public_deps += [ -@@ -499,6 +501,7 @@ static_library("non_code_constants") { +@@ -497,6 +499,7 @@ static_library("non_code_constants") { if (is_win) { sources += [ "chrome_icon_resources_win.h" ] } diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index 0b305bdf772..cd5652f4881 100644 --- a/patches/chrome-common-extensions-api-developer_private.idl.patch +++ b/patches/chrome-common-extensions-api-developer_private.idl.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl -index d9843cfd32e72b8571e5b8c1a08c06e698fed90e..f567aa7e8733ea209dadd0c65386daf6023c9b80 100644 +index 64f615524f6704258059fb4a852fb65fd40a2711..bb766a2f923389e6ebce81b2b8820415931b5323 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl -@@ -254,6 +254,7 @@ namespace developerPrivate { +@@ -255,6 +255,7 @@ namespace developerPrivate { DOMString iconUrl; DOMString id; AccessModifier incognitoAccess; diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index 639873e7823..60b71e42cf8 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index 51f7c978a0b321ce46f32df985a2321468dfb5bd..ae85d2083c75005f0ff701dde9f79445b0829eb6 100644 +index ce94b6fb4aa55af63cb6736bae0f8a22f7d6939c..3dca622f293c9a65cc37a7db1eff0df0d77af079 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn @@ -60,6 +60,7 @@ if (build_with_internal_optimization_guide) { @@ -52,7 +52,7 @@ index 51f7c978a0b321ce46f32df985a2321468dfb5bd..ae85d2083c75005f0ff701dde9f79445 if (is_chrome_branded) { package = "google-chrome" -@@ -555,3 +563,6 @@ linux_package("unstable") { +@@ -559,3 +567,6 @@ linux_package("unstable") { linux_package("canary") { channel = "canary" } diff --git a/patches/chrome-installer-setup-BUILD.gn.patch b/patches/chrome-installer-setup-BUILD.gn.patch index ddefc543240..6d0888acc0a 100644 --- a/patches/chrome-installer-setup-BUILD.gn.patch +++ b/patches/chrome-installer-setup-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn -index 4e56c210dcd03649d8dde62109865a65b3330bcc..cb7ef71f0033eb9320796758b43400d5e34cf525 100644 +index 54affaef2d1b381ebcb8caf8a9122c12f25f80b9..4e2f39b88067d21cc4ed9443144a9c52cc9a301f 100644 --- a/chrome/installer/setup/BUILD.gn +++ b/chrome/installer/setup/BUILD.gn -@@ -124,6 +124,7 @@ if (is_win) { +@@ -123,6 +123,7 @@ if (is_win) { "channel_override_work_item.h", ] } diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index 99ccd2f53c4..b40c7d75c43 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 f5028a3ec9795a6a177806ef1d9c11a63bb8bbca..cd0db8e2ed06df56a9ecc47274407489c92a14ed 100644 +index c087d1c02bca4d90d8d4721d86d87074fe67778d..0e2c27e1f12af554ca1298223b547959dd927abb 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -375,6 +375,7 @@ void GetChromeProgIdEntries( diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index eeeec5d3479..7a3c670be0d 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 3b8b9a9eb5cbffc9880f87d2c44666a924c93549..d865e21539e17aaa5536d2c2e9c0ca05049da5b9 100644 +index 3a4b21b9b90ab77b3a71d2905febac21eb54ecd1..af4afc247006c469fad73942b6ca307bb88e53ab 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -233,6 +233,7 @@ static_library("renderer") { +@@ -242,6 +242,7 @@ static_library("renderer") { "//v8", ] diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index f2ab559496f..c5501b9b362 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 b7b016ab86f4430fef65cb6fa600b7d7d2258c04..de7213fc6f9f24dd735cd713bcfc0f1fecb471b8 100644 +index ef6547e22245c8b9a5a83f25e2475541c79d1c63..4d39bceb4853a181fae43208f8737daadbe458cc 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -593,7 +593,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -609,7 +609,7 @@ void ChromeContentRendererClient::RenderFrameCreated( extensions::ExtensionsRendererClient::Get()->dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = @@ -11,7 +11,7 @@ index b7b016ab86f4430fef65cb6fa600b7d7d2258c04..de7213fc6f9f24dd735cd713bcfc0f1f render_frame, std::move(content_settings_delegate)); if (chrome_observer_.get()) { if (chrome_observer_->content_settings_manager()) { -@@ -773,6 +773,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -792,6 +792,7 @@ void ChromeContentRendererClient::RenderFrameCreated( } #endif diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index 2514b2d9905..51a75703794 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index 77af588296356e490e1a65647f8ba0b0e92efd7a..81de0c059e97ee8bbdb26dea0ee2cc641b4cdfc6 100644 +index 7401f2aa08d2c0c3bfa8f1160ed2dbf29df26b08..4e3d4c84baf3b4d762c52f42b04cb3ce4ca3a016 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h -@@ -254,6 +254,7 @@ class ChromeContentRendererClient +@@ -257,6 +257,7 @@ class ChromeContentRendererClient #endif private: diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 2a7de05f503..01a7c8f3de3 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index a82f8e9f36e86efd1e148a976c2353a08b4958c9..63f92b1963c29119cad89e2fd1337b74bc3d2cab 100644 +index 2a55a6189c6a5c399a08edf4659f33f541726093..54ee0b179f1274f252c6b720bfe5f193e22add26 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -573,6 +573,7 @@ static_library("test_support") { +@@ -577,6 +577,7 @@ static_library("test_support") { "//ui/gl", ] diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index f30671cc6af..aae06d22855 100644 --- a/patches/chrome-test-data-webui-settings-BUILD.gn.patch +++ b/patches/chrome-test-data-webui-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn -index 2142f5ec0cc411dabb1746fe44d8f1cb95399d99..c002f370af98b6a228152e0cfc37ce1a1ae81808 100644 +index 819191b2d5e09c31c34c1c9d06246b7acc463f1a..ed3dfaa99f9f33ce69551b53b1871d7827f04dcc 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -246,6 +246,7 @@ build_webui_tests("build") { +@@ -243,6 +243,7 @@ build_webui_tests("build") { ts_definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/chrome-updater-branding.gni.patch b/patches/chrome-updater-branding.gni.patch index e6b05aa6e09..0cdabf44dcd 100644 --- a/patches/chrome-updater-branding.gni.patch +++ b/patches/chrome-updater-branding.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/updater/branding.gni b/chrome/updater/branding.gni -index b929be447561fb712fef08ca5a5d8035a77b64a4..8f2c706459f59de4fa9bede95a26f50b18fbf563 100644 +index 1f9bf5847f6428224302df43a15db73b8c16ad50..75520724ef0964e184dbc10bf64f7ad6dbfd2ef4 100644 --- a/chrome/updater/branding.gni +++ b/chrome/updater/branding.gni -@@ -104,3 +104,4 @@ if (is_chrome_branded) { +@@ -106,3 +106,4 @@ if (is_chrome_branded) { # Chrome and Chromium share the same endpoints for now. update_check_url = "https://update.googleapis.com/service/update2/json" device_management_server_url = "https://m.google.com/devicemanagement/data/api" diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index 8a8cd29a653..fef11768b6b 100644 --- a/patches/chrome-utility-BUILD.gn.patch +++ b/patches/chrome-utility-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn -index 2e4234dd3fbd518db4a199b8a11ba0c64b6278a8..0f018f4cec89d16d9dae24324c04c89ccd1ef161 100644 +index 54946c415c57c5ba1df3f643e8d79b216ac0d560..4cf3cd5caacbcfa205f88d74e20e628055255a92 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -76,6 +76,8 @@ static_library("utility") { diff --git a/patches/components-browser_ui-settings-android-BUILD.gn.patch b/patches/components-browser_ui-settings-android-BUILD.gn.patch index 6083f9957e6..9e5b61b9f1b 100644 --- a/patches/components-browser_ui-settings-android-BUILD.gn.patch +++ b/patches/components-browser_ui-settings-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/settings/android/BUILD.gn b/components/browser_ui/settings/android/BUILD.gn -index 0aea26f32dc8ef55644b016a2bc971fb54925382..9155d4bf991ffa3b3283a5c0911966912145bc63 100644 +index b6adbb6333f7a8020f45ac196b6e6905d26e113c..6031f81b8bf98b323921a893885b2b67f076c493 100644 --- a/components/browser_ui/settings/android/BUILD.gn +++ b/components/browser_ui/settings/android/BUILD.gn -@@ -49,6 +49,7 @@ android_library("java") { +@@ -50,6 +50,7 @@ android_library("java") { "//ui/android:ui_no_recycler_view_java", ] resources_package = "org.chromium.components.browser_ui.settings" diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch index 6ff0662c20d..32b2748eb3d 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java -index 1a43e9ec48e539155cd18402bfd1e3024f419bc9..fcbfa8da227778fefc1cc1919dd5316652c63efc 100644 +index 41138862a1ba3b82b4845374445a3f5c5a3e2781..72b3c012257f1ecb6bf7d30cdfe01462cf19d2a8 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java -@@ -148,7 +148,7 @@ public class ChosenObjectSettings extends BaseSiteSettingsFragment +@@ -158,7 +158,7 @@ public class ChosenObjectSettings extends BaseSiteSettingsFragment getSiteSettingsDelegate().launchSettingsHelpAndFeedbackActivity(getActivity()); return true; } diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index 8cbf7d678a4..283000ba4d2 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index 37d7f933d5b30125c411ce780f112f4c19beb539..d0403de3d78aa734b02a83a16f0b8637da6fd96b 100644 +index f1d9052ab050f798c439df31408019df80457f23..f5d471b2d9ada0597f32d357523170315b4387ad 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -557,7 +557,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -568,7 +568,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); return true; } diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch index 0c57e4b2df7..974223a0eb4 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -index e57cc7addfbae88f9f7ebe5a61244c40408faaca..9357bb2492b3c005736c5a0de8c52819b9d65260 100644 +index 24eb2d64419b1bd96583446864f79cfba596fb1a..baa6f0dab30fee983e7972817f262dba0731a00b 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -@@ -71,7 +71,7 @@ public class SiteSettingsCategory { +@@ -73,7 +73,7 @@ public class SiteSettingsCategory { Type.ZOOM, Type.STORAGE_ACCESS, Type.TRACKING_PROTECTION, @@ -11,7 +11,7 @@ index e57cc7addfbae88f9f7ebe5a61244c40408faaca..9357bb2492b3c005736c5a0de8c52819 }) @Retention(RetentionPolicy.SOURCE) public @interface Type { -@@ -109,9 +109,10 @@ public class SiteSettingsCategory { +@@ -111,9 +111,10 @@ public class SiteSettingsCategory { int STORAGE_ACCESS = 29; int TRACKING_PROTECTION = 30; int HAND_TRACKING = 31; diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index bfa8ebe42dc..92eda545808 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index c288588c99f1917d16a1c5419ace695c1e79343b..92d8a8ce438f5b79b7c4f24fcd1e071d32f29eec 100644 +index e88cba8613aecff8032f72e9b3cb7ada11501ea0..f01e84f5455bcb2b11b1ae686b9eb5adad107195 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -74,7 +74,7 @@ found in the LICENSE file. diff --git a/patches/components-browsing_data-core-BUILD.gn.patch b/patches/components-browsing_data-core-BUILD.gn.patch index 6386451b24e..f880c0ff797 100644 --- a/patches/components-browsing_data-core-BUILD.gn.patch +++ b/patches/components-browsing_data-core-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/core/BUILD.gn -index b362eca9a018afd9a2453777e05eb698bda485d6..9170bc9d9738b6cf9a5c5872b9b9da999ba78897 100644 +index 9ca09f512e151ceea7efd92730d6b74592210afc..c5a96268ac4c463cbdfc18ca1ffe1c54016f467f 100644 --- a/components/browsing_data/core/BUILD.gn +++ b/components/browsing_data/core/BUILD.gn @@ -49,6 +49,7 @@ static_library("core") { diff --git a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch index 11b23adf494..5418ca7541e 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc -index e111269dd1173508cbec8f319aa1f9226f87556c..e2646e3fe4f059286af838c6c9987aeef2cb88aa 100644 +index e70e59460301b6d3dbf944d12ae6bd6acb29c373..571af6b45272d95feb18dc6b2c15c049122f43a9 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc @@ -201,6 +201,7 @@ void ContentSettingsPref::SetWebsiteSetting( diff --git a/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch b/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch index 57703e0b002..446ae5704ac 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h -index 2b5db4b27a8e36d5bd36d51ab3146f7c2e805e2a..41cd8f211347c0b43401886fc316fbd98ed899d7 100644 +index 1bc77829a65e5c4e21bfab86ed7e09e9b50f8b64..ea90febda80bbb598d69c90be6567dc3e5319cfc 100644 --- a/components/content_settings/core/browser/content_settings_pref_provider.h +++ b/components/content_settings/core/browser/content_settings_pref_provider.h @@ -92,6 +92,7 @@ class PrefProvider : public UserModifiableProvider { diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch index c84e48537f6..1f6bfd5ed49 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 0186b93b59a6bf843e00f94488d68aa5c9269163..aa483b8e3cbeba9c5b65a3a5f263ee89080dc4b6 100644 +index 6d1fed50def001bfca82fbd01adfcffc8d0ac58e..1a9f90df672276f906a05e315655ff1275d29f8d 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -834,6 +834,7 @@ void ContentSettingsRegistry::Init() { +@@ -836,6 +836,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::DESKTOP, ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); diff --git a/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch b/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch index e8a712eaa31..4ae72a1da5b 100644 --- a/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc -index 2c87f499c8d1a808a5ab6f3e9372b0741c83be66..a1ffbfff59beccfa322e32fea169f030a7500193 100644 +index 4c80092a6c62e4943f42b7830ec6da62d3277677..9271ba9e9c44474722f1b498d86b8f0e0aa126a7 100644 --- a/components/content_settings/core/browser/content_settings_uma_util.cc +++ b/components/content_settings/core/browser/content_settings_uma_util.cc -@@ -146,6 +146,7 @@ constexpr auto kHistogramValue = base::MakeFixedFlatMapGetApplicationClientIdForFileScanning(), diff --git a/patches/components-history-core-browser-BUILD.gn.patch b/patches/components-history-core-browser-BUILD.gn.patch index 30375705698..ac44ec17123 100644 --- a/patches/components-history-core-browser-BUILD.gn.patch +++ b/patches/components-history-core-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn -index 79c27f7dca8df42f6e6cfe913747ff7348c2b5f6..42306b14b69cd134f2377cf251f5991038b75186 100644 +index 629e30d3a3a0e44b5450e0f53f137d71f9333a02..efeaef25e1487a05825cee8cf80b993faca64c7b 100644 --- a/components/history/core/browser/BUILD.gn +++ b/components/history/core/browser/BUILD.gn -@@ -151,6 +151,7 @@ static_library("browser") { +@@ -153,6 +153,7 @@ static_library("browser") { "android/visit_sql_handler.h", ] } diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 731a9956f8a..5da5f746406 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,5 +1,5 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 75198bc7f61596a408209a73e16a222096bf23cd..a132aff3e657eedca3ef95742b65fbee861de093 100644 +index 6d8193d227c822c2be60fe2f6b1ae4d157440c40..312b05add503ea52b09adabd98b116829ccceb45 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -53,6 +53,8 @@ enum VisitSource { diff --git a/patches/components-metrics-BUILD.gn.patch b/patches/components-metrics-BUILD.gn.patch index 10d8c3cdb25..4245642da88 100644 --- a/patches/components-metrics-BUILD.gn.patch +++ b/patches/components-metrics-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn -index ea5e8d022312211f7b61811156625db81cc00487..bbc35758cf0f5349321fcfb0cbcb4c2e198874e5 100644 +index dff8139a6e0bbf66a1b2674e952f23edeea0b8ba..6acc4534d6b532240a9ff029c59fb4a64f46fc3b 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn -@@ -321,6 +321,7 @@ if (!is_cronet_build || is_ios) { +@@ -322,6 +322,7 @@ if (!is_cronet_build || is_ios) { "motherboard_metrics_provider.h", ] } diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 64d8cc95da1..30e775765d2 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index fa8f859e5204cbf3ce7f241613c5e9f9c978a2d3..343fca4924519568f06db19a1052cf2370558bc7 100644 +index 469daca0ec5296f95e59c4eaf80059cfc2f9314a..46ff4d70bc53acfa52fa5f5ebd515ce037f61d9d 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -372,6 +372,7 @@ static_library("browser") { +@@ -369,6 +369,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] @@ -10,7 +10,7 @@ index fa8f859e5204cbf3ce7f241613c5e9f9c978a2d3..343fca4924519568f06db19a1052cf23 configs += [ "//build/config/compiler:wexit_time_destructors" ] -@@ -985,6 +986,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") { +@@ -976,6 +977,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") { mojom("mojo_bindings") { sources = [ "omnibox.mojom" ] diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index e8fedfd8783..7c52c1c6966 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index e09aa4dba522a7cc401137ab0301babe460a0ab6..544ae49ce4d2b72e416de94f609abbe019e08260 100644 +index 0acf1d8a67d87002b04ebcb7b987fd95d13acfdc..565408a71228bf7d1636d1ac4007e75c07b5de23 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -1149,6 +1149,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { +@@ -1134,6 +1134,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { if (provider_types & AutocompleteProvider::TYPE_SEARCH) { search_provider_ = new SearchProvider(provider_client_.get(), this); providers_.push_back(search_provider_.get()); @@ -10,7 +10,7 @@ index e09aa4dba522a7cc401137ab0301babe460a0ab6..544ae49ce4d2b72e416de94f609abbe0 } // Providers run in the order they're added. Add `HistoryURLProvider` after // `SearchProvider` because: -@@ -1356,6 +1357,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type) { +@@ -1339,6 +1340,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type) { StartStopTimer(); } diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 25cc908f8a1..3365905a965 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 6ab537ffd019afab78f0b7847ff05ecca32145c2..1a9c8e0605e5e74a294dbd0a11a6419140ac08c4 100644 +index d299278cf223d76b6a06a782bf2e4c9950d47ef5..6678623638bab0278e449f48541b48bc18c15453 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -496,6 +496,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, +@@ -504,6 +504,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, (*text == display_text_ || *text == url_for_editing_)) { *url_from_text = controller_->client()->GetNavigationEntryURL(); *write_url = true; diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index 253d9e3432a..2d5a104276b 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index f8738806601f67ae917a13f0b663d64b2973312b..a3c3788e587e0a2320b2356de7d0362f371ca0b4 100644 +index de497055da9fda1ed7e5b95ab41ba86324bdca27..136182f2c3bef7efd345ebb885b21ae4a684270f 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1238,6 +1238,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1240,6 +1240,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, // applies to permissions listed in |kPermissionType|. bool PageInfo::ShouldShowPermission( const PageInfo::PermissionInfo& info) const { diff --git a/patches/components-password_manager-core-browser-password_form_filling.cc.patch b/patches/components-password_manager-core-browser-password_form_filling.cc.patch index 12cbbd04fb8..d84d0b7c34d 100644 --- a/patches/components-password_manager-core-browser-password_form_filling.cc.patch +++ b/patches/components-password_manager-core-browser-password_form_filling.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index 27a0f7de77974e685caea949964bd48400124c25..4f36d93491c333695a94e1adb3b265d6c84b9b5f 100644 +index 02160d774303e233eda0eebab43ca57d946f2b44..5c2191aa5cbd2ddbf331dff4c53507e03aa03cb1 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc @@ -225,6 +225,7 @@ LikelyFormFilling SendFillInformationToRenderer( diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 254cd0a5fa1..0467289ff9c 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 69c6cfce9fe7b6459f55b20ec4883246204d1069..9f823100aab4e229980235becb62cc3b843fa454 100644 +index b598c95dc815e19225497736db25196a0f984b04..4dc6bba523ac358fc2bbcd5f75c96229223d5ca8 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn @@ -5,7 +5,7 @@ @@ -11,7 +11,7 @@ index 69c6cfce9fe7b6459f55b20ec4883246204d1069..9f823100aab4e229980235becb62cc3b sources = [ "constants.cc", "constants.h", -@@ -163,6 +163,7 @@ source_set("permissions") { +@@ -165,6 +165,7 @@ source_set("permissions") { if (!is_android) { deps += [ "//components/guest_view/browser" ] } diff --git a/patches/components-permissions-android-BUILD.gn.patch b/patches/components-permissions-android-BUILD.gn.patch index d0701f866a8..c66a7417a27 100644 --- a/patches/components-permissions-android-BUILD.gn.patch +++ b/patches/components-permissions-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn -index a902bb20461d7b5a9178c57282b7ba15d8f916ec..e4eea11bf8240597b35532554bc13ee7788569f3 100644 +index f25f8110a3c22ad4786382d83af0a8d06eb3d24a..a9ccd94a13bf463d9c12e28cb38e9b3fcf64968e 100644 --- a/components/permissions/android/BUILD.gn +++ b/components/permissions/android/BUILD.gn -@@ -152,6 +152,7 @@ android_library("java") { +@@ -153,6 +153,7 @@ android_library("java") { "//third_party/jni_zero:jni_zero_java", "//ui/android:ui_java", ] diff --git a/patches/components-permissions-permission_manager.cc.patch b/patches/components-permissions-permission_manager.cc.patch index 57a061b7963..901b75c4237 100644 --- a/patches/components-permissions-permission_manager.cc.patch +++ b/patches/components-permissions-permission_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_manager.cc b/components/permissions/permission_manager.cc -index e82c63418be85c128ebfd8d4a177d7b5084f5138..e0bb9664557869e5e32503f9c86d48de1537bb8f 100644 +index 7841b7a574a773ca43623ffc5d658da56e7c01b8..03b050fdb1fc496c9548733e5217327b16ca81cc 100644 --- a/components/permissions/permission_manager.cc +++ b/components/permissions/permission_manager.cc -@@ -310,6 +310,7 @@ void PermissionManager::RequestPermissionsFromCurrentDocument( +@@ -291,6 +291,7 @@ void PermissionManager::RequestPermissionsFromCurrentDocument( base::OnceCallback&)> permission_status_callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -10,7 +10,7 @@ index e82c63418be85c128ebfd8d4a177d7b5084f5138..e0bb9664557869e5e32503f9c86d48de RequestPermissionsInternal(render_frame_host, request_description, std::move(permission_status_callback)); } -@@ -361,6 +362,7 @@ PermissionManager::GetPermissionResultForCurrentDocument( +@@ -342,6 +343,7 @@ PermissionManager::GetPermissionResultForCurrentDocument( PermissionUtil::PermissionTypeToContentSettingType(permission); const GURL requesting_origin = diff --git a/patches/components-permissions-permission_request_manager.cc.patch b/patches/components-permissions-permission_request_manager.cc.patch index 855b199629b..c85213604e2 100644 --- a/patches/components-permissions-permission_request_manager.cc.patch +++ b/patches/components-permissions-permission_request_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc -index add1eef3a404e31a5837343dfd27f436c7c87c09..f3c56a199896b49612d17bfa31ec1d6a0447ab56 100644 +index 2ce0b4f56580be0b0d9f55dee146438f7b64c6ab..b296fb7c2c8eaf2651e23cedd9fb1a23335aab33 100644 --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc -@@ -591,6 +591,7 @@ GURL PermissionRequestManager::GetRequestingOrigin() const { +@@ -592,6 +592,7 @@ GURL PermissionRequestManager::GetRequestingOrigin() const { GURL origin = requests_.front()->requesting_origin(); if (DCHECK_IS_ON()) { for (permissions::PermissionRequest* request : requests_) { diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index de98cf5e913..3c640be0579 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index 6696064ead3d236b3714ef5d512efb9e145c38db..65476d5560bb6b8d0153c67510c2808535eaecfb 100644 +index 4dcd5a9e808e5c6ddc477944500b3948ea7b5ea0..6b140284b5a7a8e7afd0526962c1a1ed6c7dfd0d 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc -@@ -150,6 +150,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { +@@ -154,6 +154,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { #endif case RequestType::kIdentityProvider: return RequestTypeForUma::PERMISSION_IDENTITY_PROVIDER; @@ -10,7 +10,7 @@ index 6696064ead3d236b3714ef5d512efb9e145c38db..65476d5560bb6b8d0153c67510c28085 } } -@@ -175,6 +176,7 @@ RequestTypeForUma GetUmaValueForRequests( +@@ -179,6 +180,7 @@ RequestTypeForUma GetUmaValueForRequests( return RequestTypeForUma::MULTIPLE_KEYBOARD_AND_POINTER_LOCK; } #endif diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch index 814a9bfe0f3..5ae1bbd847d 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 b93642eb6bc41a988d1861ab240393336d14316e..922a03d566d526d238af8b1edcbe8306b2447ded 100644 +index e90e8ce27cbdcc571eef7a4b315269e6395ab1de..0f1ff9d7d7100f041d2e6bd211d0e65953cb25b0 100644 --- a/components/permissions/request_type.cc +++ b/components/permissions/request_type.cc -@@ -451,6 +451,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { +@@ -470,6 +470,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { #endif case permissions::RequestType::kIdentityProvider: return "identity_provider"; 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 b3e8867b25d..1d04de85602 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 93efc660b3fef3d19ad0d0c1133fdaf475a5ca5c..9a4b029f9fb5e0ac728f13619053b41bd54618b0 100644 +index 5edc7f2a71c6c52e711ff0e715e0eeba5323ba3b..fca1adfde36114c9509f48bf32cc924a9093e9e5 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc @@ -103,6 +103,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch index a9345a5a703..e8e9813eacb 100644 --- a/patches/components-search_engines-BUILD.gn.patch +++ b/patches/components-search_engines-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn -index c006743831690d3fc5be7d8c3a9ae8c834dac900..1776f21634b1a3503d8ca9318da27e04c1f0ec8a 100644 +index 6a9a70a7c4d2d41bf576854c5be4f1cc61c3377f..4c531a189e851c018a50a8209cd835647e84d45a 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn -@@ -260,6 +260,7 @@ json_to_struct("prepopulated_engines") { +@@ -265,6 +265,7 @@ json_to_struct("prepopulated_engines") { schema_file = "prepopulated_engines_schema.json" namespace = "TemplateURLPrepopulateData" deps = [ ":search_engine_type" ] diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index c5dbff5b3ca..4180bc9ecb6 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index fd61483167a7346a1bf3eec4f67a68ee1c65e8a8..3cfa8db9709585104618ed7c8979c769387a87e2 100644 +index 6b04809f0ce444161bd5ee16cd0c735a0a4176ff..6740fd176dc3c78c7cf1f7579030f82f53e1cc14 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc -@@ -397,6 +397,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { +@@ -425,6 +425,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { // Check if default search preference is overriden by extension. if (pref->IsExtensionControlled()) { extension_default_search_ = std::move(turl_data); diff --git a/patches/components-signin-internal-identity_manager-BUILD.gn.patch b/patches/components-signin-internal-identity_manager-BUILD.gn.patch index 98c3d31f04e..a80901cd056 100644 --- a/patches/components-signin-internal-identity_manager-BUILD.gn.patch +++ b/patches/components-signin-internal-identity_manager-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/signin/internal/identity_manager/BUILD.gn b/components/signin/internal/identity_manager/BUILD.gn -index e43eb3d679bf93bd4306f6e48d94a939edb4b089..8c24b115331411fae9b0511ce82d2b821d3d72ef 100644 +index 25f8218823f1ab87ddd8a4f75eaf58f852385c4d..4520dfee0f6fc8cff91632aac25baaf042937764 100644 --- a/components/signin/internal/identity_manager/BUILD.gn +++ b/components/signin/internal/identity_manager/BUILD.gn @@ -141,6 +141,7 @@ source_set("identity_manager") { diff --git a/patches/components-sync-engine-data_type_worker.h.patch b/patches/components-sync-engine-data_type_worker.h.patch index 19980d38964..c0e4cca3d44 100644 --- a/patches/components-sync-engine-data_type_worker.h.patch +++ b/patches/components-sync-engine-data_type_worker.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/engine/data_type_worker.h b/components/sync/engine/data_type_worker.h -index 77f45821ff9ca0636442413a2c1138300ae6f210..bf26a226ac296881300be3aa43fc2f1106d7ebc4 100644 +index 01606e9bf686347d9ea80eb941c1e3edef24c14a..100ad2e6994aa1d39df9084671569cd5f6dd9566 100644 --- a/components/sync/engine/data_type_worker.h +++ b/components/sync/engine/data_type_worker.h @@ -213,6 +213,7 @@ class DataTypeWorker : public UpdateHandler, diff --git a/patches/components-sync-engine-sync_scheduler_impl.cc.patch b/patches/components-sync-engine-sync_scheduler_impl.cc.patch index 17556ab8ee4..b19f2499741 100644 --- a/patches/components-sync-engine-sync_scheduler_impl.cc.patch +++ b/patches/components-sync-engine-sync_scheduler_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/sync_scheduler_impl.cc b/components/sync/engine/sync_scheduler_impl.cc -index 4b277f769a8555e628839df4faf916a45f5b034b..d1de27bc968de785f7efa12495b41e151c0e7e36 100644 +index 575b99e84cd6f0d93c5c55e7c98d89256cc3547a..fce4fcadc0ca2ba7828d29fe5ec284896e9016bd 100644 --- a/components/sync/engine/sync_scheduler_impl.cc +++ b/components/sync/engine/sync_scheduler_impl.cc -@@ -475,6 +475,7 @@ void SyncSchedulerImpl::HandleFailure( +@@ -477,6 +477,7 @@ void SyncSchedulerImpl::HandleFailure( SDVLOG(2) << "Sync cycle failed. Will back off for " << wait_interval_->length.InMilliseconds() << "ms."; } diff --git a/patches/components-sync-engine-syncer_proto_util.cc.patch b/patches/components-sync-engine-syncer_proto_util.cc.patch index 5aceb8a96f2..2cee6f0f8b3 100644 --- a/patches/components-sync-engine-syncer_proto_util.cc.patch +++ b/patches/components-sync-engine-syncer_proto_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/syncer_proto_util.cc b/components/sync/engine/syncer_proto_util.cc -index 295397216dadc98db104f34ef4f86939d649623c..d3638127d8a93f2fd6d3c260392d73a65b14e9af 100644 +index ff0a902a716f47d216d7a7d87cb4c09ad3bf87ad..a53b1d4157b9a339dfe6f30f3c8ce702a65879e3 100644 --- a/components/sync/engine/syncer_proto_util.cc +++ b/components/sync/engine/syncer_proto_util.cc -@@ -269,6 +269,7 @@ SyncerError SyncerProtoUtil::HandleClientToServerMessageResponse( +@@ -276,6 +276,7 @@ SyncerError SyncerProtoUtil::HandleClientToServerMessageResponse( SyncProtocolError sync_protocol_error = GetProtocolErrorFromResponse(response, cycle->context()); diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index a2a47e9a662..c80241e9634 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 3120d12d4d8cb1697f68dcdc5e5b3ebcec8a5164..6050e8c8ae782dc0a536a594dcaf8066507810ee 100644 +index 22c1daac68950b8ebd2829f5bd07eff5dc441eee..a219f7c10dec031dffad4082c8bbab38485fba20 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -603,6 +603,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -604,6 +604,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 3120d12d4d8cb1697f68dcdc5e5b3ebcec8a5164..6050e8c8ae782dc0a536a594dcaf8066 VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -619,6 +620,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -620,6 +621,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(floating_workspace_last_signin_time_windows_epoch_micros); } diff --git a/patches/components-sync-service-sync_service_impl.h.patch b/patches/components-sync-service-sync_service_impl.h.patch index 856e72bd8b3..eaa68477f48 100644 --- a/patches/components-sync-service-sync_service_impl.h.patch +++ b/patches/components-sync-service-sync_service_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/service/sync_service_impl.h b/components/sync/service/sync_service_impl.h -index 6d6ff4136f6f163cfdc4dd7eaffc627572359a67..2d248c97bd00406e58eb11fb441332e98dc6fff1 100644 +index 4926ca753a0523cb463a73da4e401cb9cc5a91dc..b4d0ba261ea99051da8873c583dff8321cdf06fa 100644 --- a/components/sync/service/sync_service_impl.h +++ b/components/sync/service/sync_service_impl.h -@@ -258,6 +258,7 @@ class SyncServiceImpl : public SyncService, +@@ -257,6 +257,7 @@ class SyncServiceImpl : public SyncService, void ReportDataTypeErrorForTest(DataType type); private: diff --git a/patches/components-sync_device_info-device_info.h.patch b/patches/components-sync_device_info-device_info.h.patch index 9820f7da1d3..88c6e55eabe 100644 --- a/patches/components-sync_device_info-device_info.h.patch +++ b/patches/components-sync_device_info-device_info.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/device_info.h b/components/sync_device_info/device_info.h -index c50b0ec8ad94edf67b7357fe406a209fa322c18d..6a042f07aa7f2e3002e77eb3a38ff9e58afe3ae5 100644 +index f04075a9ec9e2c22a42e6fbc7e1d66d8d0095bf1..83737d209b9cd9221f2c2aa81a5452f5f7f487d3 100644 --- a/components/sync_device_info/device_info.h +++ b/components/sync_device_info/device_info.h -@@ -153,6 +153,7 @@ class DeviceInfo { +@@ -161,6 +161,7 @@ class DeviceInfo { DeviceInfo(const DeviceInfo&) = delete; DeviceInfo& operator=(const DeviceInfo&) = delete; diff --git a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch index 84cd1aab990..8916bf63fad 100644 --- a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch +++ b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc -index beffc314308164ca6cbc2b23f8ea31ed85eb3725..3c6706650f38248a236805f4d23cbf0ed847fedb 100644 +index 510ec2ca914af71b66360ea9648629e11fb49e8c..041a019626bfa13b30be5a09575050403b363b04 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc @@ -301,6 +301,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( @@ -27,7 +27,7 @@ index beffc314308164ca6cbc2b23f8ea31ed85eb3725..3c6706650f38248a236805f4d23cbf0e } if (change->type() == EntityChange::ACTION_DELETE) { -@@ -783,6 +785,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( +@@ -794,6 +796,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( return; } @@ -35,7 +35,7 @@ index beffc314308164ca6cbc2b23f8ea31ed85eb3725..3c6706650f38248a236805f4d23cbf0e // In the regular case for sync being disabled, wait for MergeFullSyncData() // before initializing the LocalDeviceInfoProvider. if (!syncer::IsInitialSyncDone( -@@ -1018,6 +1021,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const { +@@ -1029,6 +1032,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const { void DeviceInfoSyncBridge::ExpireOldEntries() { CHECK(store_); TRACE_EVENT0("sync", "DeviceInfoSyncBridge::ExpireOldEntries"); diff --git a/patches/components-translate-content-renderer-translate_agent.cc.patch b/patches/components-translate-content-renderer-translate_agent.cc.patch index 0c722a6f775..941b4eb45eb 100644 --- a/patches/components-translate-content-renderer-translate_agent.cc.patch +++ b/patches/components-translate-content-renderer-translate_agent.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/translate/content/renderer/translate_agent.cc b/components/translate/content/renderer/translate_agent.cc -index fb4f7da8fa69b97e5be076dc09ad2f7f5f14b714..855080bc198e17931519ad9b5269a1fa98a7a320 100644 +index 76317a2954702cf30b83cf536fd9879fd0761ab9..539ce7664698b28738359feae78d463f7620b695 100644 --- a/components/translate/content/renderer/translate_agent.cc +++ b/components/translate/content/renderer/translate_agent.cc @@ -62,7 +62,7 @@ const int kTranslateInitCheckDelayMs = 150; diff --git a/patches/components-update_client-BUILD.gn.patch b/patches/components-update_client-BUILD.gn.patch index 1c13f851ce2..198f5e3ddd7 100644 --- a/patches/components-update_client-BUILD.gn.patch +++ b/patches/components-update_client-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/update_client/BUILD.gn b/components/update_client/BUILD.gn -index 953444d2d8edd32417b59649fbe756e5fe0d235a..3fac05bd8727278816a1bcd0d5fbcd52ecf7537a 100644 +index 94f61241d765a32426007cd0e9bfffcd37847f9a..1b23d4151e737fc3f4f731afe0bfe2b9f7755e9e 100644 --- a/components/update_client/BUILD.gn +++ b/components/update_client/BUILD.gn @@ -186,6 +186,7 @@ static_library("update_client") { diff --git a/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch b/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch index 02dbc0cec7c..fde5a90847d 100644 --- a/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch +++ b/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch @@ -1,5 +1,5 @@ diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -index 4a476b69cf6b77147bb777a19416ff3b90f7d4b8..30348e7ef71608f9ff9cbaf3dbed8e8da932d246 100644 +index 89b5fb70f4efdd961edab218971aead2b515166e..0b99d1f568488fcf298b6cd7e902bf391ab79096 100644 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm @@ -1964,6 +1964,7 @@ void ExtractUnderlines(NSAttributedString* string, diff --git a/patches/content-browser-BUILD.gn.patch b/patches/content-browser-BUILD.gn.patch index 4d5e4fd8e05..b1db1426100 100644 --- a/patches/content-browser-BUILD.gn.patch +++ b/patches/content-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index a0f17bb4ff8eede75f46bb365aca5cd59a90ebad..eaff451428ce8a6ee31f48c1aaebc71816a548c3 100644 +index 4e163a30b7f987b0127cabf84a4610bfb81b9662..51a1990051ef1baa879f6a039889bafed98da935 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -3562,6 +3562,7 @@ source_set("browser") { +@@ -3543,6 +3543,7 @@ source_set("browser") { "profiling_utils.cc", ] } diff --git a/patches/content-browser-devtools-protocol_config.json.patch b/patches/content-browser-devtools-protocol_config.json.patch index 6a290093e7b..0ec283e761c 100644 --- a/patches/content-browser-devtools-protocol_config.json.patch +++ b/patches/content-browser-devtools-protocol_config.json.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/devtools/protocol_config.json b/content/browser/devtools/protocol_config.json -index 155eb915135004218b17df1ec8009134bea76a47..cbaffa042feeb11af5c7be7afc56575b533f1779 100644 +index 88ee7a25ff670b2aff339d4996a6707f03cfc601..f0dea72d3dc326a358970530b1c618c723e3bf53 100644 --- a/content/browser/devtools/protocol_config.json +++ b/content/browser/devtools/protocol_config.json @@ -96,7 +96,7 @@ 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 b88736df18d..d792fb2976a 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 cd9e8030cf3cab2dc48607f122b02a9047031b21..0b8692910928d7fa899ecbdf92a75c1d4643d2b3 100644 +index d5cfee804c3e1c0dd942c98536e3ccc41c1f2d96..2871ea44fe19dc0ec1b99294d841a1a737a090e9 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3667,16 +3667,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3668,16 +3668,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 c9ef17c360b..84846cc80cf 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 877d0240bc916e19c39782fd78d13e7be900607f..40c6d41588146dd07685cf1375e0a8b480c8f8b4 100644 +index 22bb23e6a84d3b6686461f87e846125ad7484742..915bf2551e69045d6722f788a027bd11d3ef0fb6 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -3467,6 +3467,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -3465,6 +3465,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 877d0240bc916e19c39782fd78d13e7be900607f..40c6d41588146dd07685cf1375e0a8b4 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -5242,6 +5243,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -5237,6 +5238,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch b/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch index f22cba5434f..bdd08606d23 100644 --- a/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch +++ b/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index 9c63417070d5a7a2ce734703990ccff8908abe3c..4b0c50f20913929fd6a2ca1d18e6735435c55321 100644 +index c2e377d5b1603a2d3c67a61911545ce361d418c2..9ed39154ad520033ac0c0a5cd72a432789f998ea 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -4620,6 +4620,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -4736,6 +4736,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( candidate_site_for_cookies = net::SiteForCookies(top_frame_site); } @@ -10,7 +10,7 @@ index 9c63417070d5a7a2ce734703990ccff8908abe3c..4b0c50f20913929fd6a2ca1d18e67354 std::optional nonce = ComputeNonce(is_credentialless, fenced_frame_nonce_for_navigation); return net::IsolationInfo::Create(request_type, top_frame_origin, -@@ -4630,6 +4631,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -4746,6 +4747,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( std::optional RenderFrameHostImpl::ComputeNonce( bool is_credentialless, std::optional fenced_frame_nonce_for_navigation) { @@ -18,7 +18,7 @@ index 9c63417070d5a7a2ce734703990ccff8908abe3c..4b0c50f20913929fd6a2ca1d18e67354 // If it's a credentialless frame tree, use its nonce even if it's within a // fenced frame tree to maintain the guarantee that a credentialless frame // tree has a unique nonce. -@@ -8919,6 +8921,8 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9089,6 +9091,8 @@ void RenderFrameHostImpl::CreateNewWindow( dom_storage_context, params->session_storage_namespace_id); } diff --git a/patches/content-browser-web_contents-web_contents_impl.cc.patch b/patches/content-browser-web_contents-web_contents_impl.cc.patch index 686d972450c..ddd34719880 100644 --- a/patches/content-browser-web_contents-web_contents_impl.cc.patch +++ b/patches/content-browser-web_contents-web_contents_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index e8eb786e8f3992046b5a0112c0fe76ff414f26b3..984a9bc3e4e004e7c978a195da4541e73be5aab8 100644 +index c92c7744be6916e2baea1a882ff2a55fd155b580..dfdc72d280cc1abff611c79aeccabb69828e218e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4767,7 +4767,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4804,7 +4804,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( // Save the window for later if we're not suppressing the opener (since it // will be shown immediately). diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch index da4da085b09..f087fe9453c 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index 902b2d886e0d746ac1cf6bf8bd7c265aa055972f..e9fa0d150e664a6869ac5c70f665df2574079a51 100644 +index 371e45c0f4e0682658baee02687ece01ca9193ef..d074e47d646aee32e6266610994d00a376f2702b 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc -@@ -82,6 +82,7 @@ WebUIImpl::WebUIImpl(WebContents* web_contents) +@@ -81,6 +81,7 @@ WebUIImpl::WebUIImpl(WebContents* web_contents) web_contents_observer_( std::make_unique(this, web_contents_)) { DCHECK(web_contents_); diff --git a/patches/content-common-frame.mojom.patch b/patches/content-common-frame.mojom.patch index 6b614585b47..3298bc4d2d6 100644 --- a/patches/content-common-frame.mojom.patch +++ b/patches/content-common-frame.mojom.patch @@ -1,8 +1,8 @@ diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index 37a00f8d520e6043faa9b202e2f7a3d7a0794664..a27cb13d12c1556bc11ba64a757a31c3547f0357 100644 +index 61ee456a1bfb842aefd8b644ff0ae630a698ef7c..c6dd754fc801edf44dafe9d4917efe38e7f73a88 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom -@@ -568,6 +568,7 @@ struct CreateNewWindowParams { +@@ -573,6 +573,7 @@ struct CreateNewWindowParams { // Whether the opener will be suppressed in the new window, in which case // scripting the new window is not allowed. bool opener_suppressed; diff --git a/patches/content-public-browser-BUILD.gn.patch b/patches/content-public-browser-BUILD.gn.patch index aecbd6c2c3c..d9f1f3545b1 100644 --- a/patches/content-public-browser-BUILD.gn.patch +++ b/patches/content-public-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn -index 35318cd019e2a52a071b2c426aff95040077d427..2548fee7bb96b6326f2220eeb3bbd53bf2900c63 100644 +index ce71441bd76542ce30f4e339d5bf36a30876e398..c8f4718d34c6eca6ea65641a8080b5fc6f9813df 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn -@@ -734,6 +734,7 @@ source_set("browser_sources") { +@@ -739,6 +739,7 @@ source_set("browser_sources") { if (is_chromeos_lacros) { deps += [ "//chromeos/startup" ] } diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 36f471a789d..afe96a89c70 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 3a708d41f0a10d6179dadcdbcd4c9f46bfc8149e..e45e39cd4908ec47b65fe6186eb86071b6379962 100644 +index d5e16b9e780efac46e088b3ef226e4418a90aeaf..36b85edd1027ecccbc8993d9b312743ed9f430eb 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4773,6 +4773,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4842,6 +4842,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 95a71820c71..db04a699a76 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index c8bdd54e22b9b5af03fb84d50614c54f778e0d78..6a606139bae8aacfb5c62fa5cc8ea686bfea7531 100644 +index 8fbed3f73560e4a083b016439239872b853ca4e1..73a4a259e4f46812f4a588cf037b9ba3eaaccf8a 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -909,6 +909,7 @@ void RenderThreadImpl::InitializeRenderer( diff --git a/patches/crypto-unexportable_key_metrics.cc.patch b/patches/crypto-unexportable_key_metrics.cc.patch index 1ede90d5cbe..ae5b0e0a166 100644 --- a/patches/crypto-unexportable_key_metrics.cc.patch +++ b/patches/crypto-unexportable_key_metrics.cc.patch @@ -1,5 +1,5 @@ diff --git a/crypto/unexportable_key_metrics.cc b/crypto/unexportable_key_metrics.cc -index 75a14cebd19b95ff5c8a951031cadf2235df6edc..7460bc7fddd13370fc8c935d88267161170ef494 100644 +index 1c80cebe266bbd0856cade1f127c0446786304a8..7e855d4c6cf4ac478ea3794729d695000c9d695b 100644 --- a/crypto/unexportable_key_metrics.cc +++ b/crypto/unexportable_key_metrics.cc @@ -23,6 +23,7 @@ enum class KeyType { @@ -18,7 +18,7 @@ index 75a14cebd19b95ff5c8a951031cadf2235df6edc..7460bc7fddd13370fc8c935d88267161 supported_virtual_algo = internal::TPMSupport::kECDSA; break; case SignatureVerifier::SignatureAlgorithm::RSA_PKCS1_SHA256: -@@ -195,6 +197,7 @@ void MeasureTpmOperationsInternal(UnexportableKeyProvider::Config config) { +@@ -196,6 +198,7 @@ void MeasureTpmOperationsInternal(UnexportableKeyProvider::Config config) { if (algo) { switch (*algo) { case SignatureVerifier::SignatureAlgorithm::ECDSA_SHA256: @@ -26,7 +26,7 @@ index 75a14cebd19b95ff5c8a951031cadf2235df6edc..7460bc7fddd13370fc8c935d88267161 supported_algo = internal::TPMSupport::kECDSA; break; case SignatureVerifier::SignatureAlgorithm::RSA_PKCS1_SHA256: -@@ -296,6 +299,7 @@ std::string AlgorithmToString(SignatureVerifier::SignatureAlgorithm algorithm) { +@@ -297,6 +300,7 @@ std::string AlgorithmToString(SignatureVerifier::SignatureAlgorithm algorithm) { case SignatureVerifier::SignatureAlgorithm::RSA_PSS_SHA256: return "RSA"; case SignatureVerifier::SignatureAlgorithm::ECDSA_SHA256: diff --git a/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch b/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch index d639671b5b8..cede373bc9a 100644 --- a/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch +++ b/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/extension_web_request_event_router.cc b/extensions/browser/api/web_request/extension_web_request_event_router.cc -index 06003931fd7aa1dfc1ebe0ac379b6abcff4d368d..870ff442faa3b0169f379255cee959600e5b735b 100644 +index 490310dd0a76bad341672dc0b9faf9d723db5f29..65450872c3b401d04e362d20c4808080d064e5da 100644 --- a/extensions/browser/api/web_request/extension_web_request_event_router.cc +++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc -@@ -1313,6 +1313,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, +@@ -1325,6 +1325,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, *request)) { return AuthRequiredResponse::AUTH_REQUIRED_RESPONSE_NO_ACTION; } diff --git a/patches/extensions-renderer-native_extension_bindings_system.h.patch b/patches/extensions-renderer-native_extension_bindings_system.h.patch index d001402a692..93ea7a25aee 100644 --- a/patches/extensions-renderer-native_extension_bindings_system.h.patch +++ b/patches/extensions-renderer-native_extension_bindings_system.h.patch @@ -1,5 +1,5 @@ diff --git a/extensions/renderer/native_extension_bindings_system.h b/extensions/renderer/native_extension_bindings_system.h -index a1bea558281f7a2e6b781ac53cea89746eca3f3b..6e63c267f44f4587fbb33e3bbf950e5dad7f7c2a 100644 +index 5010170d5e0e4c9054b1c9f87ad26bdc8700eb16..4b18d393e6fee5b21f0178dc67de8482b8a55a19 100644 --- a/extensions/renderer/native_extension_bindings_system.h +++ b/extensions/renderer/native_extension_bindings_system.h @@ -50,6 +50,7 @@ class NativeExtensionBindingsSystem { diff --git a/patches/ios-chrome-app-BUILD.gn.patch b/patches/ios-chrome-app-BUILD.gn.patch index 86806ef8d7f..0a0938d5e1a 100644 --- a/patches/ios-chrome-app-BUILD.gn.patch +++ b/patches/ios-chrome-app-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn -index 8583d569bd302d2929bcd521f4fdee7b8b056466..e8e47c08331340c3c19f5949b3d9ef0466261844 100644 +index 110ebebe9d02608ffc1417092ee2677b53b465b3..f6b3fa6739e905239bbd49167dc050cdc0d56d38 100644 --- a/ios/chrome/app/BUILD.gn +++ b/ios/chrome/app/BUILD.gn -@@ -892,8 +892,7 @@ chrome_app("chrome") { +@@ -896,8 +896,7 @@ chrome_app("chrome") { # (see https://crbug.com/1394553 for details of the build failure). This # is a stop-gap solution. if (target_environment == "catalyst" || diff --git a/patches/ios-chrome-browser-flags-BUILD.gn.patch b/patches/ios-chrome-browser-flags-BUILD.gn.patch index f5b694cdda4..b81c620a5f5 100644 --- a/patches/ios-chrome-browser-flags-BUILD.gn.patch +++ b/patches/ios-chrome-browser-flags-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/flags/BUILD.gn b/ios/chrome/browser/flags/BUILD.gn -index c21300755d99b35904352abb7fde533048bd29fe..1d088ce4fdca9495dc0e68c7c9a98252f5a88f1e 100644 +index 0ee67696782dfe93eac762be93fadcaac0d6b98f..060f73c44527dc17376c3bb3a23c3452bcc79f7e 100644 --- a/ios/chrome/browser/flags/BUILD.gn +++ b/ios/chrome/browser/flags/BUILD.gn -@@ -105,6 +105,7 @@ source_set("flags") { +@@ -106,6 +106,7 @@ source_set("flags") { if (ios_enable_screen_time) { deps += [ "//ios/chrome/browser/screen_time/model:feature_flags" ] } diff --git a/patches/ios-chrome-browser-flags-about_flags.mm.patch b/patches/ios-chrome-browser-flags-about_flags.mm.patch index e1933661938..d28cc66f1e0 100644 --- a/patches/ios-chrome-browser-flags-about_flags.mm.patch +++ b/patches/ios-chrome-browser-flags-about_flags.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm -index 2de52b07f6309e5278ed1862e4134be79df909d6..2d63e11f73372af0504620adf925e02e63cca73a 100644 +index 85e3c83260d3330ad72aad1562052b97f2b197b6..fc633a9f7cdf1ccbd8d140676ad5501bc9e8d8f2 100644 --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -991,6 +991,7 @@ const FeatureEntry::FeatureVariation kTabResumption2Variations[] = { +@@ -1012,6 +1012,7 @@ const FeatureEntry::FeatureVariation kEphemeralCardRankerCardOverrideOptions[] = // // When adding a new choice, add it to the end of the list. const flags_ui::FeatureEntry kFeatureEntries[] = { diff --git a/patches/ios-chrome-browser-net-model-BUILD.gn.patch b/patches/ios-chrome-browser-net-model-BUILD.gn.patch index 965c68ce60e..1d4341337af 100644 --- a/patches/ios-chrome-browser-net-model-BUILD.gn.patch +++ b/patches/ios-chrome-browser-net-model-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/net/model/BUILD.gn b/ios/chrome/browser/net/model/BUILD.gn -index f326b32d4247f6ab00de06c8394d44d1e84f9ae6..f58ea18e84d6209aae2544f5e27ab3764a1f4036 100644 +index 7bba8d0fc2654aeef115c19974bb11a26f40d1e4..67fc54523d9c7b005889ec0716fb416abede147c 100644 --- a/ios/chrome/browser/net/model/BUILD.gn +++ b/ios/chrome/browser/net/model/BUILD.gn -@@ -61,6 +61,7 @@ source_set("network_delegate") { +@@ -58,6 +58,7 @@ source_set("network_delegate") { "//ios/web/public/thread", "//net", ] diff --git a/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch b/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch index b7982cd7689..122176374e8 100644 --- a/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch +++ b/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/shared/model/prefs/BUILD.gn b/ios/chrome/browser/shared/model/prefs/BUILD.gn -index ad354df3997ed2000f121c8e4cef34ba151c3a06..446eca0115ab414969886e4bfbf71c6c9c5cde03 100644 +index 5e7050c0dcc3c6ff75aab3c7d32f8b516301bcc1..65c4939440b54befe2b58cc1cad5d0258b647a3f 100644 --- a/ios/chrome/browser/shared/model/prefs/BUILD.gn +++ b/ios/chrome/browser/shared/model/prefs/BUILD.gn -@@ -128,6 +128,7 @@ source_set("browser_prefs") { +@@ -127,6 +127,7 @@ source_set("browser_prefs") { "//ios/web/common:features", "//ui/base", ] diff --git a/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch index a92eb0635fc..232c10ad82b 100644 --- a/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm -index 1c82bdb46949cfd140dd9ec0b9243f4645ac2973..6cf3a34e3a3423c8bc725498726f94ec8fe03ff8 100644 +index 8427bd2c32187e855ffca80370e26d974045012e..ea6250c8b2de3d14d175ad5684ccf13d39a50f46 100644 --- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm +++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm -@@ -710,6 +710,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -711,6 +711,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { // List pref that stores the positions of the Safety Check module (with // notifications opt-in) within the Magic Stack. registry->RegisterListPref(prefs::kMagicStackSafetyCheckNotificationsShown); @@ -10,7 +10,7 @@ index 1c82bdb46949cfd140dd9ec0b9243f4645ac2973..6cf3a34e3a3423c8bc725498726f94ec } void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -1050,6 +1051,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -1051,6 +1052,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterInt64Pref(kNtpShownBookmarksFolder, 3); registry->RegisterDictionaryPref(prefs::kIosPreRestoreAccountInfo); diff --git a/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch b/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch index 2bb2e42ac4b..8b6a6a7772f 100644 --- a/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch +++ b/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch @@ -1,5 +1,5 @@ diff --git a/ios/chrome/browser/sync/model/sync_service_factory.mm b/ios/chrome/browser/sync/model/sync_service_factory.mm -index 98506f4e18ffc1985ccee106465bbfffe922b29e..eeec3d613a01a40b5a40c61be38f27819e8e01ae 100644 +index 85abb6a5525c550fdd27ea3edeba75d50807b62a..9cbb72fbcb7238c0e18ca082ad72f7f75d598372 100644 --- a/ios/chrome/browser/sync/model/sync_service_factory.mm +++ b/ios/chrome/browser/sync/model/sync_service_factory.mm @@ -199,7 +199,7 @@ std::unique_ptr BuildSyncService(web::BrowserState* context) { diff --git a/patches/media-audio-pulse-pulse_util.cc.patch b/patches/media-audio-pulse-pulse_util.cc.patch index c1fb8aeb441..dadd006b465 100644 --- a/patches/media-audio-pulse-pulse_util.cc.patch +++ b/patches/media-audio-pulse-pulse_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc -index 495ec8424a803ebeb55529a3f5d7f53d00fde33d..1bb1e48298d70d8e13a976f7f548b35e1ac2e66c 100644 +index a3523a9bbb1d74612ff98b3377058fff7e59c0b4..7962adae5fa1e17139de3ef1a5b4a664502730ee 100644 --- a/media/audio/pulse/pulse_util.cc +++ b/media/audio/pulse/pulse_util.cc @@ -43,7 +43,7 @@ namespace { diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 02b53221a83..0c59aab6701 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 ca877b38dc730ed77bb211f0b1fb0a857c03a23c..7edb1afe36322cd6f0aa66013d02e10e695a9e9c 100644 +index e229ec4c97bb6beeba509da8d1ab40be17d5992a..56b0227f35f7d48a35a9c4c6c9edb91bf11fd047 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1146,6 +1146,7 @@ component("net") { +@@ -1161,6 +1161,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 2b511cfbb5e..5358f86bcf1 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 789b8fdf25ff5d557eca6713f9a9e86f32e60398..ee3d75198e6c69e1a6f9681ed08ed9f6a14cc01c 100644 +index 303640b1f24d01cb3fc666043ae968725c6d2b20..2e2390077d5409998f28e00b914b7d51e5e2e186 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc @@ -292,6 +292,7 @@ base::Time CanonicalCookie::ValidateAndAdjustExpiryDate( diff --git a/patches/net-dns-host_resolver_manager_job.cc.patch b/patches/net-dns-host_resolver_manager_job.cc.patch index 50a549ad8d5..a4e57bc6cf6 100644 --- a/patches/net-dns-host_resolver_manager_job.cc.patch +++ b/patches/net-dns-host_resolver_manager_job.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/dns/host_resolver_manager_job.cc b/net/dns/host_resolver_manager_job.cc -index 9b94a3fb1a26a062e2fc4568031c8902e0944f44..60e12e87d45675a7405884cddd5c24e1034e70bb 100644 +index 26caf93df8be62d90349c9c122499820917dbf6b..a2ae1a63e99997b9758ad3693eb0b31781b253a4 100644 --- a/net/dns/host_resolver_manager_job.cc +++ b/net/dns/host_resolver_manager_job.cc -@@ -1051,6 +1051,7 @@ void HostResolverManager::Job::CompleteRequests( +@@ -1050,6 +1050,7 @@ void HostResolverManager::Job::CompleteRequests( } RecordJobHistograms(results, task_type); diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index 1281bf54d8e..1d6df8ab9e1 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index d25dc43074f15d81504dcf062a0284f73c417698..4bd9b404270d2d92dd33e92ea12cac722183022b 100644 +index e6a3cd1e84b3b28c3ba9ef221257dd868f750558..26f2798e83ebf1ed4d88e8cbea8f75aef632ce19 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -704,6 +704,7 @@ ResultCode LaunchWithoutSandbox( +@@ -709,6 +709,7 @@ ResultCode LaunchWithoutSandbox( base::Process* process) { base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 571a5856243..2414e5d5dff 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index f2142b3835b1b097da16509687bc15292e988811..3ea852088f97552fccaf7758cb9fa91ca4bb6a14 100644 +index e1f01b66955a000d11f361b5924f1f5b42719015..4a1656e35ec6834ce641ef501defc2f21d36b39c 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -191,6 +191,7 @@ component("cpp") { +@@ -175,6 +175,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/third_party-blink-common-permissions-permission_utils.cc.patch b/patches/third_party-blink-common-permissions-permission_utils.cc.patch index 9d8e47dc2ae..378a31cbc20 100644 --- a/patches/third_party-blink-common-permissions-permission_utils.cc.patch +++ b/patches/third_party-blink-common-permissions-permission_utils.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc -index dd0745d18cdea5eb0e3f170dcfe3ede2def910d5..102f99fb867db0fa53f9069505d1eb1f8c8a63ad 100644 +index 0aa40dfe497454424d7fd410e7e9ee8d6227ecd1..eb08c07ed1fe201f6bd3947d7b0903b1dbcf3e9a 100644 --- a/third_party/blink/common/permissions/permission_utils.cc +++ b/third_party/blink/common/permissions/permission_utils.cc @@ -28,6 +28,7 @@ mojom::PermissionStatus ToPermissionStatus(const std::string& status) { diff --git a/patches/third_party-blink-public-mojom-BUILD.gn.patch b/patches/third_party-blink-public-mojom-BUILD.gn.patch index 2cd0709f66a..bafe1d01d27 100644 --- a/patches/third_party-blink-public-mojom-BUILD.gn.patch +++ b/patches/third_party-blink-public-mojom-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn -index e166d3dc94fbbcb36bd0a2fdb0888e3d3b2bbb5a..aa08dfb1c071e5e882dcc26cf9611b8715d3524f 100644 +index 370568de1b0259186921806818bde2400af0fab2..f4a62ae60faf1f50f4d131c61dcaca47d7e25a8b 100644 --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn -@@ -1140,6 +1140,7 @@ mojom("mojom_platform") { +@@ -1143,6 +1143,7 @@ mojom("mojom_platform") { ] cpp_typemaps += shared_cpp_typemaps blink_cpp_typemaps += shared_cpp_typemaps 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 63c9d6e47f9..eb43a0424b7 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,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index b32ebc3e6b26be43234456d5b7070d1983d2b8a1..0deee86f3769dda08b218fd5e2a305e8e9265a79 100644 +index 38090961ab13a8da6dd324bd90e86fc7b8861dbc..05c80a21415e074724f11e391ff630d1ef88726b 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -3051,6 +3051,7 @@ generated_interface_sources_in_modules = [ +@@ -3093,6 +3093,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 2b8fdf9b4b7..1d5fe3b85ae 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index 39a8a9284099f4e29b1d3d3d267bd585e778fedb..3bdbc269764aa34feab25c1b4a1a326f18455937 100644 +index b4548d4bd436f736e29c0bf0c539bf786255acf2..2b48daaaf22b61bdae2ba79739f713c5db9a6e96 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1266,6 +1266,7 @@ static_idl_files_in_modules = [ +@@ -1268,6 +1268,7 @@ static_idl_files_in_modules = [ "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl", "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ] diff --git a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch index 39ce74cb761..3cef677eff0 100644 --- a/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch +++ b/patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -index 77009d6d2da31439504477496b9121037fc19cc0..912cdc84f542039a0ce7f34b3b0d9b0ab601426e 100644 +index d25512891f4bc7946b4921e095a10303b9553a0b..2d327c1dd960033e35bff13cefe2fd0695a859e2 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -@@ -7598,3 +7598,4 @@ def generate_interfaces(task_queue): +@@ -7644,3 +7644,4 @@ def generate_interfaces(task_queue): "InitIDLInterfacesForTesting", "init_idl_interfaces_for_testing", for_testing=True) diff --git a/patches/third_party-blink-renderer-build-scripts-make_instrumenting_probes.py.patch b/patches/third_party-blink-renderer-build-scripts-make_instrumenting_probes.py.patch index b90253b4add..8020ad5c4ef 100644 --- a/patches/third_party-blink-renderer-build-scripts-make_instrumenting_probes.py.patch +++ b/patches/third_party-blink-renderer-build-scripts-make_instrumenting_probes.py.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py b/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py -index dc76ba59292e4052bf596dbc45caf07ee7661362..a1a2340b4ec63f6fd1724465938f0a81aa3bd6c4 100644 +index b72547e3f183cb4aab3b4b78ca1730086aeb93d7..cb1dd67bfca81d54115a257fbd2821a16368119c 100644 --- a/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py +++ b/third_party/blink/renderer/build/scripts/make_instrumenting_probes.py -@@ -307,5 +307,6 @@ def main(): +@@ -308,5 +308,6 @@ def main(): h_file.close() diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 9b5d82bc075..7bc1a7dd21b 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 9cb087c578629d872d2a2c12a046471527372c81..bb60bde6620de9214a5df2d75a8bd0a983167ccc 100644 +index d6bdf90cc367cfd2dd8a6bea596593384bcde9d9..f60504ac263cc147ef39ceffc67e6b008dcf3a26 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -430,6 +430,7 @@ component("core") { +@@ -431,6 +431,7 @@ component("core") { "Carbon.framework", ] } diff --git a/patches/third_party-blink-renderer-core-frame-dom_window.h.patch b/patches/third_party-blink-renderer-core-frame-dom_window.h.patch index ff5b3b66931..4f5cb40cbc8 100644 --- a/patches/third_party-blink-renderer-core-frame-dom_window.h.patch +++ b/patches/third_party-blink-renderer-core-frame-dom_window.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/frame/dom_window.h b/third_party/blink/renderer/core/frame/dom_window.h -index 3dc36830f55cfe9bd706127c7aa67652751d5fe9..6e94d653283646c92e6bc08557977d86e1f07d31 100644 +index 0225048d6c1b38191537c7dd22defa39c5d2620c..afd9f04a505420bfde40024c5b6c46425a9e2229 100644 --- a/third_party/blink/renderer/core/frame/dom_window.h +++ b/third_party/blink/renderer/core/frame/dom_window.h -@@ -199,6 +199,7 @@ class CORE_EXPORT DOMWindow : public WindowProperties { +@@ -200,6 +200,7 @@ class CORE_EXPORT DOMWindow : public WindowProperties { void DisconnectFromFrame() { frame_ = nullptr; } diff --git a/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch b/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch index 96331246178..dc20b89ee15 100644 --- a/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch +++ b/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 20081a8a84ffbebda7cf8e3c0d9d106b11ce0373..37978dbc590d0357da92d9ef1cf26834701af307 100644 +index 7b8158aff39c247e1729edb032833cdebf949acf..7b73cde673fcf9ad13a516ea607d155752eabc57 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -486,6 +486,7 @@ bool LocalDOMWindow::CanExecuteScripts( +@@ -488,6 +488,7 @@ bool LocalDOMWindow::CanExecuteScripts( return false; } bool script_enabled = GetFrame()->ScriptEnabled(); 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 7f8030ac7c4..9b38f1cd724 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 87a560855cc3f57bafc6b70789fecc1ba3dfe979..20e547ac6458b91438cf48fa25483f28c3270b77 100644 +index 03adc55524d7edf35ee9e37f9a3483bc13990e33..1d567daf56d9aa1dd0b334b6c59168b93ccbf2c1 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 -@@ -1137,6 +1137,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1136,6 +1136,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch index a205092156b..f0068877fd4 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -index 8de96d2bbb188089e345eb3d57c525ac711f916d..4f46dba9312d2f9f064fefe7bd1befd02c5f1f8c 100644 +index 579277cff3b7cd2255cd0d8532bd86d649b20b21..26c717e7b97eac9fa52d32fc265cccfb6d90822e 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -@@ -316,6 +316,7 @@ class CORE_EXPORT HTMLCanvasElement final +@@ -320,6 +320,7 @@ class CORE_EXPORT HTMLCanvasElement final bool ShouldDisableAccelerationBecauseOfReadback() const; diff --git a/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch b/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch index fb396c8783c..a6939c07a0d 100644 --- a/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -index f1c5e885a1c3aeeccb94cb1e056b3b6192c268c7..f4e3558f21235df9f4d7ecc919cbf229e680080c 100644 +index 60c95eae422cee677442f6c6701a420a948bcff2..3de14851a5211f14db237edead52c85b5034efc9 100644 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -510,6 +510,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -520,6 +520,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( // Check if |url| is allowed to run JavaScript. If not, client hints are not // attached to the requests that initiate on the render side. diff --git a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch index 8992ed0e10f..8cde1a4866b 100644 --- a/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch +++ b/patches/third_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -index b092799cf7889e73591285e7d68b55e9d96abd17..20b22f4d1936884092618c81e897d35de3b603cd 100644 +index 71ca06d056d951c0417e8ead1803def8a810d856..4db48d4b5517ce53eb59b045f7c8fa771a68df40 100644 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -@@ -491,5 +491,13 @@ +@@ -508,5 +508,13 @@ name: "WindowManagement", permissions_policy_name: "window-management", }, diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index cb34feffbcb..f1f28a36df7 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 742d8f6996389caecfca6a42d66ddec56909fd8e..b2a016ee8b9a15d8bceb202eb40833e8f5720229 100644 +index c5bd977747bcdb03320dabe554c62010a654afe1..1c5654141afdc24c195a6382148861e8b46b8e68 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -20,6 +20,7 @@ if (is_ios) { @@ -10,7 +10,7 @@ index 742d8f6996389caecfca6a42d66ddec56909fd8e..b2a016ee8b9a15d8bceb202eb40833e8 config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -176,6 +177,7 @@ component("modules") { +@@ -177,6 +178,7 @@ component("modules") { # generating the snapshot for android, blink is compiled with # current_os="linux" and target_os="android". Using target_os is necessary as # we need to compile in the same way as would happen when current_os="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 4a34a1a29b0..8c5f78b1d2f 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 c39b333c1652ac3e1b3d6f8628887258e4c9a749..bc52b42ee1ae28b056487d4297315b0b0130925b 100644 +index 08cc3b5719df276d8fb27f59e6f28a26ee80890f..1c3772f37e2025f27b8db9d7e347bcbf4a794c03 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 -@@ -2686,6 +2686,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -2740,6 +2740,7 @@ ImageData* BaseRenderingContext2D::getImageData( perfetto::EventContext GetEventContext(); ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index c39b333c1652ac3e1b3d6f8628887258e4c9a749..bc52b42ee1ae28b056487d4297315b0b int sx, int sy, int sw, -@@ -2859,6 +2860,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2913,6 +2914,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } @@ -18,7 +18,7 @@ index c39b333c1652ac3e1b3d6f8628887258e4c9a749..bc52b42ee1ae28b056487d4297315b0b return image_data; } -@@ -3529,6 +3531,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { +@@ -3583,6 +3585,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { return MakeGarbageCollected(); } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch index 32b61ec168a..e15143e55cf 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -index 375f3a4b69b917446d4699381e60ab95c3f26855..00403e3f4cc4cd8dfda9c701e6a35b0ef87b3652 100644 +index 233226153482533729508107fbcdd70a448d8b47..a7bcd5a4e8afc181c65dc54c2a268ab383b6d2cc 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -@@ -117,10 +117,10 @@ interface CanvasRenderingContext2D { +@@ -119,10 +119,10 @@ interface CanvasRenderingContext2D { void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); @@ -17,7 +17,7 @@ index 375f3a4b69b917446d4699381e60ab95c3f26855..00403e3f4cc4cd8dfda9c701e6a35b0e // text (see also the CanvasDrawingStyles interface) [HighEntropy] void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth); -@@ -149,8 +149,8 @@ interface CanvasRenderingContext2D { +@@ -151,8 +151,8 @@ interface CanvasRenderingContext2D { [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch index ab4288f0717..0a7d250c1fb 100644 --- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -index 6e571b3290c67c5f8c50554af056643c34ea46fb..d9fb314068a5bdd5c4c427f0ea561df8d80edd35 100644 +index f4d298fe9122382e26d4c730b47d39ee36f5fe59..b0fcc25364d499f40c5d8e86ddabbdd05c92daf5 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -@@ -66,10 +66,10 @@ +@@ -67,10 +67,10 @@ [HighEntropy] void stroke(Path2D path); [HighEntropy] void clip(optional CanvasFillRule winding); [HighEntropy] void clip(Path2D path, optional CanvasFillRule winding); @@ -17,7 +17,7 @@ index 6e571b3290c67c5f8c50554af056643c34ea46fb..d9fb314068a5bdd5c4c427f0ea561df8 // text (see also the CanvasDrawingStyles interface) [HighEntropy] void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth); -@@ -93,8 +93,8 @@ +@@ -94,8 +94,8 @@ [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); diff --git a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch index e7371a37c4b..16f0955984e 100644 --- a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl -index 73f5cec21b5e154dc2c70cea1b7e8ae2c35dfc04..300a77bd9fc23cf43df32d56183e453648ce5f5b 100644 +index c9e2aea0f6b39592c756132a578a55e75c93ae04..8fbefc4c121dc3be524cf9c5e7d075a481d27116 100644 --- a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl -@@ -63,10 +63,10 @@ +@@ -64,10 +64,10 @@ void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 2fbc791b838..f9fe7ed8b0c 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index c2f46e684a8e880c8ceedd615e649b50d90ea7fd..a41e4ffd7640540119501370e24dbac69118e139 100644 +index 0fc8eecb684bb28588c29945d26246e45b813ca1..97fd18039ff9040610dfe0102ac7db9575ed0e27 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc @@ -4796,6 +4796,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, 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 0012cebe1b5..4f7066d07ab 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,5 +1,5 @@ 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 d7c290c860837cfdbdc9c5614bd2b13582c11ef5..1ab67e30c02fe74f42eb62f7d4704e89cc8cab48 100644 +index 4f2067d37ed743e09cbfe1fb58189c8b2c3700b0..7b09e82e5cf286e0bae1f1324b55907231a7ae80 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 @@ -3181,6 +3181,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( @@ -162,7 +162,7 @@ index d7c290c860837cfdbdc9c5614bd2b13582c11ef5..1ab67e30c02fe74f42eb62f7d4704e89 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4934,6 +4954,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4933,6 +4953,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index e524bf3a634..76675ab71e4 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 712aa3be12f3a77f38d71ce3d907048881d537ff..9fe122499e32e1c542b977eab449d53351f0d19d 100644 +index 5b8e391fd8998614fca3c5224e53227e250a4bce..47a9a5e51d89c8ade2e9f908701917c8d735d16c 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1916,6 +1916,7 @@ component("platform") { +@@ -1923,6 +1923,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch index ff6bdba7099..c6f3ed47dfb 100644 --- a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch +++ b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index be667dab7841d4dca4b42584fca7a00cb421dc1b..afb14e3da786fe731c1e89c784fc4d0dc461d3ea 100644 +index d3567a9c93e0e90bbe6d9c3b9d37d71fe4c3e733..d0c6bca8131378f6d1d098db64cdf335032bd3b7 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1896,6 +1896,7 @@ +@@ -1941,6 +1941,7 @@ // In-development features for the File System Access API. name: "FileSystemAccessAPIExperimental", status: "experimental", @@ -10,7 +10,7 @@ index be667dab7841d4dca4b42584fca7a00cb421dc1b..afb14e3da786fe731c1e89c784fc4d0d }, { // The FileSystemHandle.getCloudIdentifiers() method (see -@@ -1911,6 +1912,7 @@ +@@ -1956,6 +1957,7 @@ // Non-OPFS File System Access API. name: "FileSystemAccessLocal", status: {"Android": "test", "default": "stable"}, @@ -18,7 +18,7 @@ index be667dab7841d4dca4b42584fca7a00cb421dc1b..afb14e3da786fe731c1e89c784fc4d0d }, { name: "FileSystemAccessLockingScheme", -@@ -2723,6 +2725,7 @@ +@@ -2747,6 +2749,7 @@ { name: "MiddleClickAutoscroll", status: "test", @@ -26,7 +26,7 @@ index be667dab7841d4dca4b42584fca7a00cb421dc1b..afb14e3da786fe731c1e89c784fc4d0d }, // Killswitch. Remove after 1 or 2 stable releases. { -@@ -3807,6 +3810,7 @@ +@@ -3827,6 +3830,7 @@ { name: "Serial", status: {"Android": "", "default": "stable"}, diff --git a/patches/third_party-lit-v3_0-BUILD.gn.patch b/patches/third_party-lit-v3_0-BUILD.gn.patch index c1d3208d51e..27ada2e3d89 100644 --- a/patches/third_party-lit-v3_0-BUILD.gn.patch +++ b/patches/third_party-lit-v3_0-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/lit/v3_0/BUILD.gn b/third_party/lit/v3_0/BUILD.gn -index e20b1d8b20a873427c813ccb2ca9f41676a9df32..7827967fe49c54d4fef27f4b1e04c46ab1f8f380 100644 +index fe174a32360dd420a1c7af120e8906464f4de24b..798c034f7850926e4f3b9a80a4abe633faa248da 100644 --- a/third_party/lit/v3_0/BUILD.gn +++ b/third_party/lit/v3_0/BUILD.gn -@@ -70,6 +70,7 @@ ts_library("build_ts") { +@@ -79,6 +79,7 @@ ts_library("build_ts") { "//ui/webui/resources/cr_components/most_visited:build_ts", "//ui/webui/resources/cr_components/theme_color_picker:build_ts", "//ui/webui/resources/cr_elements:build_ts", @@ -10,7 +10,7 @@ index e20b1d8b20a873427c813ccb2ca9f41676a9df32..7827967fe49c54d4fef27f4b1e04c46a ] composite = true in_files = [ -@@ -148,6 +149,7 @@ ts_library("build_ts") { +@@ -157,6 +158,7 @@ ts_library("build_ts") { "${node_modules}/@lit/reactive-element/reactive-element.d.ts", target_gen_dir), ] diff --git a/patches/third_party-polymer-v3_0-BUILD.gn.patch b/patches/third_party-polymer-v3_0-BUILD.gn.patch index f988f92a45f..fcbfb2251a8 100644 --- a/patches/third_party-polymer-v3_0-BUILD.gn.patch +++ b/patches/third_party-polymer-v3_0-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/polymer/v3_0/BUILD.gn b/third_party/polymer/v3_0/BUILD.gn -index 8d04b1d0a6013ac30f6aa9f9f33ee9a697db0495..7d29215b57a5bdb9e957a83675caee3d0033357f 100644 +index 2223ebf02ac6d90b5a597e6d25b989c2c8f3077b..c1855e897d60531e4e265fd65256ebff40526b78 100644 --- a/third_party/polymer/v3_0/BUILD.gn +++ b/third_party/polymer/v3_0/BUILD.gn @@ -37,10 +37,12 @@ js_files = [ @@ -15,7 +15,7 @@ index 8d04b1d0a6013ac30f6aa9f9f33ee9a697db0495..7d29215b57a5bdb9e957a83675caee3d js_files += [ "iron-a11y-announcer/iron-a11y-announcer.js", "iron-behaviors/iron-control-state.js", -@@ -269,11 +271,13 @@ ts_library("library") { +@@ -270,11 +272,13 @@ ts_library("library") { # Also needed on LaCros for Print Preview. Remove once CrOS Print Preview # launches. if (is_chromeos) { @@ -29,7 +29,7 @@ index 8d04b1d0a6013ac30f6aa9f9f33ee9a697db0495..7d29215b57a5bdb9e957a83675caee3d definitions += [ "components-chromium/iron-a11y-announcer/iron-a11y-announcer.d.ts", "components-chromium/iron-collapse/iron-collapse.d.ts", -@@ -300,4 +304,5 @@ ts_library("library") { +@@ -301,4 +305,5 @@ ts_library("library") { "components-chromium/paper-tooltip/paper-tooltip.d.ts", ] } diff --git a/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch b/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch index 5196904b99f..fa480382421 100644 --- a/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch +++ b/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/ppv_lite86/v0_2/BUILD.gn b/third_party/rust/ppv_lite86/v0_2/BUILD.gn -index adb1b1e8f62d030de735d7f9a0b4cedc199eabca..5ffffac49a8921909518ccb7be33690bd4406252 100644 +index 54cc984db728b921dd495c3ddaa3c7df16cc98a5..557565c9d49a0dec51b87a21984af2a375aacad0 100644 --- a/third_party/rust/ppv_lite86/v0_2/BUILD.gn +++ b/third_party/rust/ppv_lite86/v0_2/BUILD.gn -@@ -44,5 +44,4 @@ cargo_crate("lib") { +@@ -45,5 +45,4 @@ cargo_crate("lib") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch b/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch index c4f65762392..2b0dc469842 100644 --- a/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch +++ b/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/rustc_version/v0_4/BUILD.gn b/third_party/rust/rustc_version/v0_4/BUILD.gn -index 892b10bb58ee64bfef15aa4ead0831f1df7afbfe..db88ea00395d746581c04ce0a5e4d32f4cf28db9 100644 +index 22e051538e3747fb5a78034ff1962b55bde1e525..2af3a3a2a4a7a52b9c2a5e310a2e09c0c62d2b15 100644 --- a/third_party/rust/rustc_version/v0_4/BUILD.gn +++ b/third_party/rust/rustc_version/v0_4/BUILD.gn -@@ -35,5 +35,4 @@ cargo_crate("buildrs_support") { +@@ -34,5 +34,4 @@ cargo_crate("buildrs_support") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-syn-v2-BUILD.gn.patch b/patches/third_party-rust-syn-v2-BUILD.gn.patch index 5097c4887c3..504cded29bd 100644 --- a/patches/third_party-rust-syn-v2-BUILD.gn.patch +++ b/patches/third_party-rust-syn-v2-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/rust/syn/v2/BUILD.gn b/third_party/rust/syn/v2/BUILD.gn -index 11d76ecc8488e3e3e6da62c6a1cd0a01a885d0b2..e3473ce4c3a21d5afacdf4643761cfe38951a0d2 100644 +index 8e224876385a12f32de94419476926c573589532..2af412c861019760ed49a0ef10422da5fcb3e7b1 100644 --- a/third_party/rust/syn/v2/BUILD.gn +++ b/third_party/rust/syn/v2/BUILD.gn @@ -98,4 +98,5 @@ cargo_crate("lib") { diff --git a/patches/third_party-tflite-BUILD.gn.patch b/patches/third_party-tflite-BUILD.gn.patch index 8c4526cd5fd..9ae82dc4372 100644 --- a/patches/third_party-tflite-BUILD.gn.patch +++ b/patches/third_party-tflite-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/tflite/BUILD.gn b/third_party/tflite/BUILD.gn -index de0c83507ad68ed0363fd73a390700dbd37d8f16..0ce607c69cf239b43924d1f52054c2f6235d52e0 100644 +index ff1851f79d7f34935a9b0d4b0a3009738ee4b84b..b5ee6f5a4b21640f7674173c1fd4d0751702f47d 100644 --- a/third_party/tflite/BUILD.gn +++ b/third_party/tflite/BUILD.gn -@@ -202,6 +202,7 @@ tflite_static_library("tflite_builtin_op_resolver") { +@@ -214,6 +214,7 @@ tflite_static_library("tflite_builtin_op_resolver") { "//services/webnn/*", "//third_party/mediapipe/*", ] diff --git a/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch b/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch index f8370102d56..788e15dc161 100644 --- a/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch +++ b/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch @@ -1,8 +1,8 @@ diff --git a/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py b/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py -index 352c75f6ef31f7c2d2da194b7d5aa5e219735597..72757a433826d4565904d58927508f38aea72969 100644 +index acff26c6c9af9290a44a2c9f9fb155c5a25acee2..956620c2d08fb3cf02d8b213833dcb8cdba6ec6f 100644 --- a/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py +++ b/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py -@@ -486,3 +486,4 @@ def FindAllAvailableBrowsers(finder_options, device): +@@ -466,3 +466,4 @@ def FindAllAvailableBrowsers(finder_options, device): return [] return browsers diff --git a/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch b/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch index 7708295c994..fbb713ae4e3 100644 --- a/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch +++ b/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch @@ -1,8 +1,8 @@ diff --git a/config/gni/devtools_grd_files.gni b/config/gni/devtools_grd_files.gni -index 46b25683cb5b9bdb4c185663b23982aada1128e9..2f27a3450bb4ffa64b092d9281b3dc0f7070bd37 100644 +index e91dd7ec06daafb87b6b95d991a8de062f476406..bd7757515f1b2f3bfbd1699bf3391957077796c1 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni -@@ -2393,6 +2393,7 @@ grd_files_debug_sources = [ +@@ -2427,6 +2427,7 @@ grd_files_debug_sources = [ "front_end/ui/visual_logging/LoggingState.js", "front_end/ui/visual_logging/NonDomState.js", ] diff --git a/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch b/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch index e1d7ad7f614..dff85292f9d 100644 --- a/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/core/sdk/NetworkManager.ts b/front_end/core/sdk/NetworkManager.ts -index ffb2d5c379f24e907f4f0eea5e167f7ac09a7dec..79036f630c1ce500ba12fea5454be6274fefaefa 100644 +index e9d60c5b49c1c0464aa311dee0cc0f3cb726e1bb..89f8d5739576d62075a5c4d5a44bc8dc3d95bb92 100644 --- a/front_end/core/sdk/NetworkManager.ts +++ b/front_end/core/sdk/NetworkManager.ts -@@ -1261,6 +1261,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { +@@ -1262,6 +1262,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { return request; } } diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch index 5ddef4427fd..9257472d511 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/panels/application/ApplicationPanelSidebar.ts b/front_end/panels/application/ApplicationPanelSidebar.ts -index b1521c5c316e8df37dd539405f25efcba335fa27..464dc9acc1312b634304a1c998fe86054a4e99af 100644 +index a743c919aa4ed2d8afbad42ffcbf284770bd3a9f..85eb3fbaca6ec512be0efc00b5d51e56bea5a52e 100644 --- a/front_end/panels/application/ApplicationPanelSidebar.ts +++ b/front_end/panels/application/ApplicationPanelSidebar.ts -@@ -445,6 +445,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe +@@ -443,6 +443,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe // Work-around for crbug.com/1152713: Something is wrong with custom scrollbars and size containment. // @ts-ignore this.contentElement.style.contain = 'layout style'; diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch b/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch index b1d04eed3fc..aed0f897df5 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/front_end/panels/network/BUILD.gn b/front_end/panels/network/BUILD.gn -index ae6567f3aa73d2e8918f070c20020e9573ae9443..19cf1196a3a04aa4d8718955d738de81eb3310f1 100644 +index 8df5bcf644ebbf840b4722929b4aeaaf0ff43ae1..c8b3af9913269652ce5e43ac20469fc7fc436bcf 100644 --- a/front_end/panels/network/BUILD.gn +++ b/front_end/panels/network/BUILD.gn @@ -96,6 +96,7 @@ devtools_module("network") { diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch index 1e6f059f2d7..da15b4a91f9 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/panels/network/NetworkDataGridNode.ts b/front_end/panels/network/NetworkDataGridNode.ts -index 57b61c3497c0ec1b06fb3567f0e5c1a2e4d27755..5c5a9ca654ee654edafa003cff2b8bc5d6edb9b9 100644 +index 3b4a4340310636ded499cb62063ff9f8ba6e44bb..c961f37d1113808fdc4b4609dfc86c32b7f859f3 100644 --- a/front_end/panels/network/NetworkDataGridNode.ts +++ b/front_end/panels/network/NetworkDataGridNode.ts -@@ -1601,6 +1601,7 @@ export class NetworkRequestNode extends NetworkNode { +@@ -1602,6 +1602,7 @@ export class NetworkRequestNode extends NetworkNode { cellElement.appendChild(subtitleElement); } } diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch index 0d0eaf35d7e..69f972cb03c 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch @@ -1,5 +1,5 @@ diff --git a/front_end/panels/network/NetworkItemView.ts b/front_end/panels/network/NetworkItemView.ts -index 645aae8d1fb76a898cea88baf3f39ef5675449cb..e0a1e412b74afb01eeae2721dceff9a6927758d0 100644 +index 2504e196a6d7ccda5fff14684eae0c1b5e189f85..30dca5160f9c82c89142e119fe55a5b60cbf7ad5 100644 --- a/front_end/panels/network/NetworkItemView.ts +++ b/front_end/panels/network/NetworkItemView.ts @@ -359,3 +359,4 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane { diff --git a/patches/third_party/devtools-frontend/src/front_end-ui-legacy-themeColors.css.patch b/patches/third_party/devtools-frontend/src/front_end-ui-legacy-themeColors.css.patch index 5dc88287714..1add147c420 100644 --- a/patches/third_party/devtools-frontend/src/front_end-ui-legacy-themeColors.css.patch +++ b/patches/third_party/devtools-frontend/src/front_end-ui-legacy-themeColors.css.patch @@ -1,8 +1,8 @@ diff --git a/front_end/ui/legacy/themeColors.css b/front_end/ui/legacy/themeColors.css -index fd0aab1edd6257754bda25de16ca5063aed4bfa2..a2b3cc842b110df9553f4bf37919500f57f74654 100644 +index 07623fc6c5badb55d7e07381ceb6e91f5e69fdf5..574a8ee79f68638d29b08ba5a9823b6de07469f5 100644 --- a/front_end/ui/legacy/themeColors.css +++ b/front_end/ui/legacy/themeColors.css -@@ -564,7 +564,7 @@ +@@ -569,7 +569,7 @@ /* Outlines */ --sys-color-outline: var(--ref-palette-neutral-variant60); diff --git a/patches/tools-crates-gnrt-lib-gn.rs.patch b/patches/tools-crates-gnrt-lib-gn.rs.patch index 95f01aa919d..93ab81ccff9 100644 --- a/patches/tools-crates-gnrt-lib-gn.rs.patch +++ b/patches/tools-crates-gnrt-lib-gn.rs.patch @@ -1,5 +1,5 @@ diff --git a/tools/crates/gnrt/lib/gn.rs b/tools/crates/gnrt/lib/gn.rs -index 69fd9562101dac2a03decf973b363935f80983e0..772d544d83a3dfc63c24def29d77b7b0670c1017 100644 +index 30204a678f8b6bb8ebf883fec992c1269e1e8b17..7a8da3ef040b0c69f38098dd87a912961abb316f 100644 --- a/tools/crates/gnrt/lib/gn.rs +++ b/tools/crates/gnrt/lib/gn.rs @@ -202,8 +202,9 @@ pub fn build_rule_from_dep( diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 01ff4e8bb3c..3e4447dadb8 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 0b5a99d16b9d39169dce95a1b16ce2eceba7a4dd..a89aedeb1dceb14c56d96b19f263ccaa6613fcf6 100644 +index ee2a113e2b77873b18d60deee0a373ea335bf149..90be8efa823833d4a1177deea21abf234f0b60f2 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -38,6 +38,9 @@ @@ -35,7 +35,7 @@ index 0b5a99d16b9d39169dce95a1b16ce2eceba7a4dd..a89aedeb1dceb14c56d96b19f263ccaa "includes": [4040], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings_shared/resources.grd": { -@@ -1011,6 +1014,9 @@ +@@ -1015,6 +1018,9 @@ "components/components_chromium_strings.grd": { "messages": [7020], }, diff --git a/patches/tools-json_schema_compiler-idl_schema.py.patch b/patches/tools-json_schema_compiler-idl_schema.py.patch index 3902e32bc35..3d3ccf25a96 100644 --- a/patches/tools-json_schema_compiler-idl_schema.py.patch +++ b/patches/tools-json_schema_compiler-idl_schema.py.patch @@ -1,8 +1,8 @@ diff --git a/tools/json_schema_compiler/idl_schema.py b/tools/json_schema_compiler/idl_schema.py -index 8760683cb9e11544dd922f055751b6bc66145147..43fdb809999b9f783ac14ea040cd4d60252a1b63 100755 +index a94b4bf3897a473064e2a19c8d2028ea14c29ede..079609ae584237ad11f7153d523178905fb3a775 100755 --- a/tools/json_schema_compiler/idl_schema.py +++ b/tools/json_schema_compiler/idl_schema.py -@@ -577,6 +577,8 @@ class IDLSchema(object): +@@ -578,6 +578,8 @@ class IDLSchema(object): documentation_options['namespace'] = node.value elif node.name == 'documented_in': documentation_options['documented_in'] = node.value diff --git a/patches/tools-licenses-licenses.py.patch b/patches/tools-licenses-licenses.py.patch index 27e6624e3d0..6b2a93dacbc 100644 --- a/patches/tools-licenses-licenses.py.patch +++ b/patches/tools-licenses-licenses.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py -index 07b33f9c3e909216d9282954ebaaef7c56c2dbac..dc0ef3be2ca244d809732a2cd217bde941351037 100755 +index f72e5cdb2a889775e7d72b8dea992ac562c5dde3..3330ddf48fe4d7520a44751cebc837ead2565e0d 100755 --- a/tools/licenses/licenses.py +++ b/tools/licenses/licenses.py @@ -41,6 +41,7 @@ _REPOSITORY_ROOT = os.path.abspath( @@ -18,7 +18,7 @@ index 07b33f9c3e909216d9282954ebaaef7c56c2dbac..dc0ef3be2ca244d809732a2cd217bde9 # These buildtools/third_party directories only contain # chromium build files. The actual third_party source files and their -@@ -786,7 +788,8 @@ def FindThirdPartyDirs(root, extra_third_party_dirs=None): +@@ -785,7 +787,8 @@ def FindThirdPartyDirs(root, extra_third_party_dirs=None): if skip in dirs: dirs.remove(skip) @@ -28,7 +28,7 @@ index 07b33f9c3e909216d9282954ebaaef7c56c2dbac..dc0ef3be2ca244d809732a2cd217bde9 # Add all subdirectories that are not marked for skipping. for d in dirs: dirpath = os.path.join(path, d) -@@ -1033,8 +1036,10 @@ def GenerateCredits(file_template_file, +@@ -1032,8 +1035,10 @@ def GenerateCredits(file_template_file, _REPOSITORY_ROOT, enable_warnings=enable_warnings) if not directory_metadata: 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 e2beb5c570a..4ddf26137a9 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 29fc9c7d92a723401abf5734324bd5b5c5f67e84..ae067e5fb1a6973f26c4190cc83eac648250ca8b 100644 +index 00d660e65dde7cd6c6f1e39cce19fb01e7576c9e..278cd9b551ac596b7d3913b1105886224e483a65 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -@@ -2710,6 +2710,7 @@ chromium-metrics-reviews@google.com. +@@ -2631,6 +2631,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch b/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch index da29e95a33c..49f63fd703f 100644 --- a/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch +++ b/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/metadata/page/histograms.xml b/tools/metrics/histograms/metadata/page/histograms.xml -index 56c9a1ad1ae783e03b5bd2c82f319a0f9cb55162..aba0f75098f8b90848d9ad784fcf78a99f100fb7 100644 +index 05c13c72943201d944c348e4613ce372ac5dc6ec..c1941c1acc14b3e97e90a4e7dc36e9061796f581 100644 --- a/tools/metrics/histograms/metadata/page/histograms.xml +++ b/tools/metrics/histograms/metadata/page/histograms.xml -@@ -213,6 +213,17 @@ chromium-metrics-reviews@google.com. +@@ -232,6 +232,17 @@ chromium-metrics-reviews@google.com. diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index e2e906060de..0821e92bfcb 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 1388140fcb81fcd56404aba6dea3ec32911b963c..9db88556d4923891d10f44c6fa0516e628127443 100644 +index 79937bebda1b3405a8acbf1559ebd994a3f7bf0b..0d1c50a52eb656bce586b82d146ac7ada7097a5d 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -561,6 +561,7 @@ component("base") { +@@ -567,6 +567,7 @@ component("base") { "//ui/events", "//ui/events/devices", ] diff --git a/patches/ui-color-color_id.h.patch b/patches/ui-color-color_id.h.patch index 5184dedd6b2..9dbb12c5883 100644 --- a/patches/ui-color-color_id.h.patch +++ b/patches/ui-color-color_id.h.patch @@ -1,8 +1,8 @@ diff --git a/ui/color/color_id.h b/ui/color/color_id.h -index 71a9ce1f6b57b6b8843abda6bd3e4999530aa828..91edfd07f1fc213253ca57a16a6ee6ab2e9bb8f4 100644 +index 6884198248d78e707efc5ed5c4d121db5d5dbeec..e1bd9f55848909493ca9bcb67cf4ab3a8317dc45 100644 --- a/ui/color/color_id.h +++ b/ui/color/color_id.h -@@ -671,6 +671,7 @@ +@@ -672,6 +672,7 @@ #define COLOR_IDS \ CROSS_PLATFORM_COLOR_IDS \ diff --git a/patches/ui-views-controls-menu-menu_separator.cc.patch b/patches/ui-views-controls-menu-menu_separator.cc.patch index 90e88ed4283..6350e40a7a9 100644 --- a/patches/ui-views-controls-menu-menu_separator.cc.patch +++ b/patches/ui-views-controls-menu-menu_separator.cc.patch @@ -1,5 +1,5 @@ diff --git a/ui/views/controls/menu/menu_separator.cc b/ui/views/controls/menu/menu_separator.cc -index 464dfdea6ba913111a0b1c99eaf7ba7680391a0e..03cd5cc0c16975546aa065d34f4d6e014c085ef6 100644 +index 67a3ca814b8ab31da379eaa31d7e13eb6fa1fef0..bee9d7d393499c5227f3862807638aae29251339 100644 --- a/ui/views/controls/menu/menu_separator.cc +++ b/ui/views/controls/menu/menu_separator.cc @@ -51,6 +51,7 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) { diff --git a/patches/ui-webui-resources-cr_elements-BUILD.gn.patch b/patches/ui-webui-resources-cr_elements-BUILD.gn.patch index a67421a9c8a..d53647439e2 100644 --- a/patches/ui-webui-resources-cr_elements-BUILD.gn.patch +++ b/patches/ui-webui-resources-cr_elements-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_elements/BUILD.gn -index 02c0a5e1e72885e6355454feeabc296baa67aa18..afd3435ea01c343602d1e466b3ca2116ea8c2ca6 100644 +index a2480aec8aa60f1965700cc09de3278ffaab0342..fd99d6ed01d982860e1fca93a0a13fd928b2dbfc 100644 --- a/ui/webui/resources/cr_elements/BUILD.gn +++ b/ui/webui/resources/cr_elements/BUILD.gn -@@ -215,6 +215,7 @@ build_webui("build") { +@@ -223,6 +223,7 @@ build_webui("build") { ts_composite = true ts_deps = [ "../js:build_ts" ] if (include_polymer) { diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index 693cb19ae4e..1dc1e8f38ee 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/BUILD.gn b/BUILD.gn -index 19e0d2b584790eed3f633152f25665aa333d6f4a..1c37679001a9eec0972b621478dbf5f218d104fb 100644 +index 87b212921bb8d51fd5457a7b4d61ee956589c282..18c6eaacd1723928019fab1ca75383da8691eceb 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -772,6 +772,7 @@ config("internal_config_base") { +@@ -762,6 +762,7 @@ config("internal_config_base") { "include", "$target_gen_dir", ] @@ -10,7 +10,7 @@ index 19e0d2b584790eed3f633152f25665aa333d6f4a..1c37679001a9eec0972b621478dbf5f2 } config("internal_config") { -@@ -3205,6 +3206,7 @@ v8_header_set("v8_headers") { +@@ -3235,6 +3236,7 @@ v8_header_set("v8_headers") { ":cppgc_headers", ":v8_version", ] diff --git a/patches/v8/src-codegen-compiler.cc.patch b/patches/v8/src-codegen-compiler.cc.patch index 23a37dfd591..b050ed39271 100644 --- a/patches/v8/src-codegen-compiler.cc.patch +++ b/patches/v8/src-codegen-compiler.cc.patch @@ -1,8 +1,8 @@ diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc -index a6407a56aa8d6d73ec0bdcf94fa4bbd4e2c1cbb4..bb5534000ea941529c1dd50734953ab6d02c9963 100644 +index 4215cee6ae7335c1ffa21735202458f52faeee2c..6a0c47366e4d93ff4861e05b93158848b0b64adf 100644 --- a/src/codegen/compiler.cc +++ b/src/codegen/compiler.cc -@@ -3327,6 +3327,7 @@ MaybeHandle Compiler::GetFunctionFromEval( +@@ -3279,6 +3279,7 @@ MaybeHandle Compiler::GetFunctionFromEval( } } DCHECK(is_compiled_scope.is_compiled());