diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 06c57300183..5071c434334 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 d0317b2920ca8b545d3294d6121aa0085969ab0b..d6fcb16256402dbb67ea99df82296a001e4d38b9 100644 +index c9811ba7835ed8f96dbde412543e86dc3b5ab13b..7b526c35d13c4d619342ead7cbaa4c0fe62a7c26 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4818,6 +4818,7 @@ if (is_android) { +@@ -4836,6 +4836,7 @@ if (is_android) { "android/java/src/org/chromium/base/UserDataHost.java", "android/java/src/org/chromium/base/ValueChangedCallback.java", ] @@ -10,7 +10,7 @@ index d0317b2920ca8b545d3294d6121aa0085969ab0b..d6fcb16256402dbb67ea99df82296a00 resources_package = "org.chromium.base" -@@ -5474,6 +5475,7 @@ if (is_android) { +@@ -5497,6 +5498,7 @@ if (is_android) { "android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java", ] diff --git a/patches/base-metrics-histogram_functions.h.patch b/patches/base-metrics-histogram_functions.h.patch index 9c84174bd8e..9796a71aca4 100644 --- a/patches/base-metrics-histogram_functions.h.patch +++ b/patches/base-metrics-histogram_functions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/metrics/histogram_functions.h b/base/metrics/histogram_functions.h -index eda83e423676e27631ff7b15bff03a89315fb3a6..0dd9bafa643ad34c2205398eb502f4cbeba8218f 100644 +index 16e9aeaea73d3ddcad45ec59c5fd374a9b54fd20..529d0df5fcbf0b581a5703fdc2552a85046a40d9 100644 --- a/base/metrics/histogram_functions.h +++ b/base/metrics/histogram_functions.h -@@ -89,6 +89,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) { +@@ -86,6 +86,7 @@ void UmaHistogramEnumeration(const StringType& name, T sample) { "Enumeration's kMaxValue is out of range of " "LinearHistogram::kBucketCount_MAX. Use a sparse histogram " "instead."); diff --git a/patches/base-trace_event-builtin_categories.h.patch b/patches/base-trace_event-builtin_categories.h.patch index 2b1c2fcb773..63a9d54319e 100644 --- a/patches/base-trace_event-builtin_categories.h.patch +++ b/patches/base-trace_event-builtin_categories.h.patch @@ -1,8 +1,8 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 56408734b26428933a1fb8c04cee317c659feea7..4a60b4244fdc821c71aa8a9b19bd8619cf45458e 100644 +index 39168e90fd6ea68e562f0a2c6d8ba1162bc29e71..5c7b2bd8288f24e31e08c091da02aef68e4b8ba1 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -279,6 +279,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS( +@@ -282,6 +282,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS( perfetto::Category("webrtc").SetTags("audio", "video"), perfetto::Category("webrtc_stats"), perfetto::Category("xr"), diff --git a/patches/build-android-gyp-lint.py.patch b/patches/build-android-gyp-lint.py.patch index c3e4e544c5b..f112ee9efb4 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 a9120ee83475b5fb9ca60934d0df2319637b15b5..5a7d00ac44d405578b45d0878767737a68fa2a37 100755 +index 4ec0458d4325302bf49d7b04112329bee6084f8c..917b53f6f0e594a8065ac739d8b7cf29801c52f4 100755 --- a/build/android/gyp/lint.py +++ b/build/android/gyp/lint.py -@@ -463,5 +463,6 @@ def main(): +@@ -453,5 +453,6 @@ def main(): server_utils.MaybeTouch(args.stamp) diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index c037206d526..be6d77f8c2a 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 4174baa9c0e39b517ade66aab07123eaf9b58e47..6ac15e59c566a7721193f4dc7349b20fadf36a7e 100644 +index 4d1ac59b9b7dc05a20a3bb523b17706a00761cde..3beaf22c51b7cc2b7c0a1a8c4968f68d572b3cd1 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -343,6 +343,7 @@ is_posix = !is_win && !is_fuchsia diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch index ac36010f718..50028b4fa63 100644 --- a/patches/build-config-android-BUILD.gn.patch +++ b/patches/build-config-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn -index 1e17083d3737458eb3397776b6ed8a8f02f52797..fb57f9244eafa79528bbbabd78f7d74a9aa40eba 100644 +index 8c59c78bce5995391e344b99c4eb3c383f5163be..1bdc9ea6bb329d71b8da9f617c4778941c691e17 100644 --- a/build/config/android/BUILD.gn +++ b/build/config/android/BUILD.gn @@ -64,6 +64,7 @@ config("compiler") { diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 2f3c9dfa323..09eb2b6dc7d 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 cc12ce785a97775955ec26d1821688b9bb48fce0..199be21a8ca00c625af4c8c0b031472e81664202 100644 +index b9babd477e7482011136c5e53725b4a0da292e6f..57b28faf5c8259478b503bf8d2786abeb7c493c8 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -28,6 +28,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 0981050b10b..093e4dbe457 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 b047ff19a3e8df53af9cc45d99e8ea8b82ea4f0a..bd5c6570e38f21cdfd4d89519fa7eaa60e7d42e7 100644 +index b7a2264f28bf11ad1a73a8a705260597b19b7679..33299e8b0751c8b4ea326f30135835dbcadd25d7 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -3657,6 +3657,7 @@ if (enable_java_templates) { +@@ -3649,6 +3649,7 @@ if (enable_java_templates) { # Filter directly in compile_java.py when no other processing is required. _processed_jar_path = _javac_jar_path } @@ -10,7 +10,7 @@ index b047ff19a3e8df53af9cc45d99e8ea8b82ea4f0a..bd5c6570e38f21cdfd4d89519fa7eaa6 } if (_build_device_jar) { -@@ -3864,6 +3865,7 @@ if (enable_java_templates) { +@@ -3856,6 +3857,7 @@ if (enable_java_templates) { if (defined(_enable_bytecode_checks) && _enable_bytecode_checks) { enable_bytecode_checks = _enable_bytecode_checks } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 464f7294865..829a8937e22 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 cd213c57051d1780eb42a320ab25fb5c0b3956bf..65c9f59bb03dc2a16c2a7d03434154942c78b17a 100644 +index 18867073f2af6f982fe98384b7144ca1ce362815..c43037458ce0958ab3fe0bcac5e6727e0805d03f 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -208,6 +208,7 @@ if (!is_robolectric && enable_java_templates) { diff --git a/patches/build-dotfile_settings.gni.patch b/patches/build-dotfile_settings.gni.patch index 952fb94b4f4..e5a0f29b929 100644 --- a/patches/build-dotfile_settings.gni.patch +++ b/patches/build-dotfile_settings.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/dotfile_settings.gni b/build/dotfile_settings.gni -index 4911002e5c18b9532af94ea1ef725d9e497ecc59..aeb5c222833b43b62d7df6653c649eb6bb56f74c 100644 +index 928b3215b71cbf1b36ba182e3f38ef02fe9d1da0..ef404ebcd7e97c4290b12fddd0ed5279e64f0976 100644 --- a/build/dotfile_settings.gni +++ b/build/dotfile_settings.gni -@@ -38,3 +38,4 @@ build_dotfile_settings = { +@@ -39,3 +39,4 @@ build_dotfile_settings = { "//build/util/branding.gni", ] } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 578adf66852..9224ffd3629 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 d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8ff09a048 100644 +index c8c10cdab040d39f69fa56aad12fc8b1c67854f3..db0b99f8458986328be3495d0415b4d60a306a8f 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -195,6 +195,7 @@ if (!is_android && !is_mac) { +@@ -200,6 +200,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 deps += [ ":chrome_dll", -@@ -499,11 +500,12 @@ if (is_win) { +@@ -505,11 +506,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -523,6 +525,7 @@ if (is_win) { +@@ -529,6 +531,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 if (enable_updater) { deps += [ ":chromium_updater_privileged_helper" ] -@@ -668,6 +671,7 @@ if (is_win) { +@@ -674,6 +677,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 d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 } } -@@ -711,9 +715,11 @@ if (is_win) { +@@ -717,9 +721,11 @@ if (is_win) { "--scm=0", ] } @@ -52,7 +52,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 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. -@@ -738,6 +744,7 @@ if (is_win) { +@@ -744,6 +750,7 @@ if (is_win) { info_plist_target = invoker.info_plist_target } else { info_plist_target = ":chrome_helper_plist" @@ -60,7 +60,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 } extra_substitutions = [ -@@ -921,6 +928,7 @@ if (is_win) { +@@ -927,6 +934,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 d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 } else { sources += [ "$root_out_dir/${updater_product_full_name}.app" ] -@@ -1206,6 +1214,7 @@ if (is_win) { +@@ -1215,6 +1223,7 @@ if (is_win) { "-current_version", chrome_dylib_version, ] @@ -76,7 +76,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1403,6 +1412,7 @@ if (is_win) { +@@ -1412,6 +1421,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -84,7 +84,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1448,7 +1458,7 @@ group("dependencies") { +@@ -1458,7 +1468,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -93,7 +93,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1497,6 +1507,7 @@ group("resources") { +@@ -1507,6 +1517,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", @@ -101,7 +101,7 @@ index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8 ] } -@@ -1551,6 +1562,7 @@ if (!is_android) { +@@ -1561,6 +1572,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 201c85d9c63..c6410e91489 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d89686cd6 100644 +index d8bd462bc9349d5a4dbe8b07bf3bcac97cda8272..77c77159d847ec53b3dfb68f6379deab29e5e0d8 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -163,6 +163,7 @@ if (_is_default_toolchain) { +@@ -164,6 +164,7 @@ if (_is_default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -10,7 +10,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d } android_resources("chrome_app_java_resources") { -@@ -272,6 +273,7 @@ if (_is_default_toolchain) { +@@ -277,6 +278,7 @@ if (_is_default_toolchain) { if (enable_extensions_core) { deps += [ "//chrome/browser/ui/android/extensions:java_resources" ] } @@ -18,7 +18,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d } android_resources("java_overlay_resources") { -@@ -813,6 +815,7 @@ if (_is_default_toolchain) { +@@ -823,6 +825,7 @@ if (_is_default_toolchain) { ] deps += feed_deps @@ -26,7 +26,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -830,6 +833,7 @@ if (_is_default_toolchain) { +@@ -840,6 +843,7 @@ if (_is_default_toolchain) { "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen", "//components/touch_to_search/core/browser:quick_action_category_enum_javagen", ] @@ -34,7 +34,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d # From java_sources.gni. sources = chrome_java_sources -@@ -967,6 +971,7 @@ if (_is_default_toolchain) { +@@ -979,6 +983,7 @@ if (_is_default_toolchain) { # TODO(crbug.com/434123514): see if we can remove these stub targets. deps += [ "//chrome/browser/ui/android/extensions/windowing/stub:java" ] } @@ -42,7 +42,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -1719,6 +1724,7 @@ if (_is_default_toolchain) { +@@ -1737,6 +1742,7 @@ if (_is_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 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -1871,6 +1877,7 @@ if (_is_default_toolchain) { +@@ -1889,6 +1895,7 @@ if (_is_default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,7 +58,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d } } -@@ -2129,6 +2136,7 @@ if (_is_default_toolchain) { +@@ -2148,6 +2155,7 @@ if (_is_default_toolchain) { "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -66,7 +66,7 @@ index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d # More deps for DFMs. if (dfmify_dev_ui) { -@@ -3107,6 +3115,7 @@ if (_is_default_toolchain) { +@@ -3135,6 +3143,7 @@ if (_is_default_toolchain) { "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 d144e54f84d..5d71b6c74d3 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 7baeeaff95f804c51945e68a8a1e967260340a2c..ff67097dfc5b8571397b2a688983f3092fffcdf2 100644 +index 78babfd827c3a544c8290d19c1d6bca02a2acdf4..39052678cea518da1fbbe72bd697cb719b2bf486 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1302,3 +1302,4 @@ if (enable_screen_capture) { +@@ -1317,3 +1317,4 @@ if (enable_screen_capture) { "java/src/org/chromium/chrome/browser/media/MediaCapturePickerTabObserver.java", ] } diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 07265662635..bac2696798e 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 6bd4fc5504337705757f4f1e8683e5bcb8d4043a..ac7a59523f4312b4ba17cfaca77e0522bb7a2c82 100644 +index 9f7fe934e456b429435fa46c1a532d81d292cb5d..82a7935767a92cfaf0db2ab6797117e4c87aab60 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -291,6 +291,7 @@ template("chrome_common_apk_or_module_tmpl") { @@ -18,7 +18,7 @@ index 6bd4fc5504337705757f4f1e8683e5bcb8d4043a..ac7a59523f4312b4ba17cfaca77e0522 if (_is_test) { proguard_configs += [ "//chrome/android/proguard/apk_for_test.flags" ] } -@@ -666,6 +668,7 @@ template("chrome_common_apk_or_module_tmpl") { +@@ -687,6 +689,7 @@ template("chrome_common_apk_or_module_tmpl") { "version_code", "version_name", ]) diff --git a/patches/chrome-android-features-tab_ui-BUILD.gn.patch b/patches/chrome-android-features-tab_ui-BUILD.gn.patch index 001a6cc9fe6..1073bda74c6 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 30b0a449fd2dafbd57ff053859621a07ca3ee5c6..ca59096b6b6a90d83cdc058d37c763fb5d3c3f8a 100644 +index fd17b1ddb6ee7dfbf94482c47f6a52b0421baa46..abfe03db56e6769bc708374c137d95f093a807b1 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn -@@ -135,6 +135,7 @@ android_resources("java_resources") { +@@ -133,6 +133,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 64a2a125f83..9fc865bd570 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,8 +1,8 @@ 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 7d9d0d142300d1d2e2cdb13644b300550954b4ad..110890a4c2ff41ac9c2f1212718f298054c33c27 100644 +index 5eeaae1b713d705b0e0ff0d325f533828e5e7857..9c5c8f33ff46aece80d7bbf8711d4894ed9b5354 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 -@@ -351,7 +351,7 @@ public class FeedSurfaceMediator +@@ -345,7 +345,7 @@ public class FeedSurfaceMediator // Start is showing, update the value of Pref.ENABLE_SNIPPETS_BY_DSE here. The // value should be updated before adding an observer to prevent an extra call of // updateContent(). diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 3ade20f06b5..452f6f31c6c 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 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e9287044ea84 100644 +index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61e166e7ed 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -38,6 +38,7 @@ by a child template that "extends" this file. @@ -70,7 +70,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928 -@@ -166,7 +179,9 @@ by a child template that "extends" this file. +@@ -169,7 +182,9 @@ by a child template that "extends" this file. @@ -80,7 +80,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928 -@@ -383,6 +398,7 @@ by a child template that "extends" this file. +@@ -385,6 +400,7 @@ by a child template that "extends" this file. @@ -88,7 +88,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928 -@@ -925,6 +941,7 @@ by a child template that "extends" this file. +@@ -942,6 +958,7 @@ by a child template that "extends" this file. @@ -96,7 +96,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928 @@ -104,7 +104,7 @@ index 3e672c08e2e6389750c489889e51cb77a5694f2c..79d7a9e2481b1ec047f44e1bbbb7e928 {% endif %} diff --git a/patches/chrome-android-java-res-xml-main_preferences.xml.patch b/patches/chrome-android-java-res-xml-main_preferences.xml.patch index a0ea999e803..9385234ef8b 100644 --- a/patches/chrome-android-java-res-xml-main_preferences.xml.patch +++ b/patches/chrome-android-java-res-xml-main_preferences.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml -index 2599b098db6b4228643a868d5093373cb1787b9c..2cdfa16591649676865177458d4af8276e7c9e55 100644 +index 972f4db05736e73be0e9bbf5cd3d7d71a705428b..50e107a3295a2a071670f0a26619ebc62dc97521 100644 --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml @@ -64,7 +64,7 @@ found in the LICENSE file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 6cc7e8f083a..516feb7b678 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index ec155c488f20e31440fd97f6f99b0e23fc834129..7a0e9d96bdfd35d2bfd854eb6c2866611098d9cc 100644 +index 2c6c55b1aa5b0481692af89c5b341c106d822bfe..68d6580b49963ada988b625d905c3167f947cf25 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -887,6 +887,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt +@@ -897,6 +897,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt private void closeIfNoTabsAndHomepageEnabled( boolean isPendingClosure, boolean shouldRemoveWindowWithZeroTabs) { if (getTabModelSelector().getTotalTabCount() == 0) { @@ -10,7 +10,7 @@ index ec155c488f20e31440fd97f6f99b0e23fc834129..7a0e9d96bdfd35d2bfd854eb6c286661 if (shouldRemoveWindowWithZeroTabs) { mMultiInstanceManager.closeChromeWindowIfEmpty(mWindowId); } else if (HomepageManager.getInstance() -@@ -3461,6 +3462,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt +@@ -3583,6 +3584,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt if (mMultiInstanceManager != null) { mMultiInstanceManager.onTabStateInitialized(); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index 69b2c763270..cb2138abd2a 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -index 47cfe3b76ef1184e5aa18abd3cef7c43a23cf73f..a050d4a40ae625ffd19e1464dac31277f632d7f0 100644 +index e8e655dfb0ddafcf9f5588c9be1e579521252451..ee1c69db9e99efd530468e4ae0b1275b76321548 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -656,7 +656,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -659,7 +659,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity mBottomContainer = findViewById(R.id.bottom_container); SnackbarManager snackbarManager = @@ -11,7 +11,7 @@ index 47cfe3b76ef1184e5aa18abd3cef7c43a23cf73f..a050d4a40ae625ffd19e1464dac31277 this, mBottomContainer, getWindowAndroid(), -@@ -3017,6 +3017,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -3082,6 +3082,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity */ public void onExitVr() {} diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-appmenu-AppMenuPropertiesDelegateImpl.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-appmenu-AppMenuPropertiesDelegateImpl.java.patch index 0d79dc9102d..5ef482724ba 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-appmenu-AppMenuPropertiesDelegateImpl.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-appmenu-AppMenuPropertiesDelegateImpl.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -index 31a8692bb45c2d910483bceaf1255ca152eb2c3d..1ecb2788087fca03ac0607181ce11c3954669a4d 100644 +index 5bde2932a1a077ec0eb009e1a6b88aaaf00ad4b4..7ac0d73ea05296da27f0eb3357c9602fa2f1982f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java @@ -43,6 +43,7 @@ import org.chromium.build.annotations.NullMarked; @@ -10,7 +10,7 @@ index 31a8692bb45c2d910483bceaf1255ca152eb2c3d..1ecb2788087fca03ac0607181ce11c39 import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; -@@ -683,7 +684,7 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties +@@ -682,7 +683,7 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties // is not persisted when adding to the homescreen. // * If creating shortcuts it not supported by the current home screen. return WebappsUtils.isAddToHomeIntentSupported() diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch index 16465602714..b0f61338749 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -index 83188504d8feb30dfa05f8c7024c70295777e666..ef34be18ca5ffc9b3d5d0a8e24ce19564063060c 100644 +index d5f5a4e3c1173b890de04e124b791b131b92ce44..bc8e222ff6a0c89cc47016a689879429fe722fed 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -@@ -356,7 +356,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -357,7 +357,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment } /** Called when browsing data is about to be cleared. */ 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 09945375d56..ecc6b85b54b 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 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c3547474516842 100644 +index e122d1d9e6ded00acc4183c64c0894f3a5a69893..d59543df6067dd5499d5d89eb6949880ebc8ef44 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 -@@ -233,6 +233,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -243,6 +243,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { Action.EXIT_PICTURE_IN_PICTURE, Action.OPEN_IN_INCOGNITO_WINDOW, Action.VIEW_PAGE_SOURCE, @@ -10,7 +10,7 @@ index 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c35474 }) @Retention(RetentionPolicy.SOURCE) public @interface Action { -@@ -289,7 +290,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -299,7 +300,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { int EXIT_PICTURE_IN_PICTURE = 50; int OPEN_IN_INCOGNITO_WINDOW = 51; int VIEW_PAGE_SOURCE = 52; @@ -19,7 +19,7 @@ index 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c35474 } // LINT.ThenChange(/tools/metrics/histograms/enums.xml:ContextMenuOptionAndroid) -@@ -522,6 +523,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -532,6 +533,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-ntp-NewTabPage.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPage.java.patch index 3a57a010ca5..6498e33e0a3 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPage.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPage.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -index 9f32ee8c94ee001a8e9dc2f3c30c4c413e72235f..f7daf168960a7e0ecf027530a8d9d71abe26da1b 100644 +index f0fbb3837ea1f04f587f7c75d6936d6158f1a671..1d5f9922f7a970b0e0afc2d9ee910e346047cfdf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -912,7 +912,7 @@ public class NewTabPage +@@ -831,7 +831,7 @@ public class NewTabPage * NTP. */ public static boolean isInSingleUrlBarMode(boolean isTablet) { 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 8dea58e4922..903d33f885e 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 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fcb8f3c9be 100644 +index fd566ce93a14eb0deddc82126061861c78b1b383..ce739b896c8ffcd19c044972f798e65701e1e1d1 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 -@@ -84,7 +84,7 @@ import java.util.function.Consumer; +@@ -86,7 +86,7 @@ import java.util.function.Consumer; /** Fragment to keep track of the all the privacy related preferences. */ @NullMarked @@ -11,7 +11,7 @@ index 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fc implements Preference.OnPreferenceChangeListener { private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; -@@ -563,6 +563,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -565,6 +565,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fc MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon( -@@ -577,7 +578,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -579,7 +580,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 b0710ab8649..5c7c80e4dc3 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 d9b6b3fe661d038cabe3675471c09f57341eb177..954dbe6b9aca2ec138954d5e69a96796fecbd9c2 100644 +index bdc44a47df82f729f183d11b16dd7a921d4245bd..79f1a18bef8e94b653f3989d4311ac4a63fc96ca 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 -@@ -64,7 +64,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator; +@@ -65,7 +65,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator; 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; @@ -11,7 +11,7 @@ index d9b6b3fe661d038cabe3675471c09f57341eb177..954dbe6b9aca2ec138954d5e69a96796 import org.chromium.components.browser_ui.settings.ChromeBasePreference; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SettingsUtils; -@@ -626,6 +626,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment +@@ -628,6 +628,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment */ private void updateSyncPreferences() { String signedInAccountName = diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index b6d894692b5..78b3a7b60f0 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -index 19b27b83ddc8b1ff2ece1a9de2f9252fd82ab484..8b6db337a9c6d6bc01726adea0ee11e2ab4ccd14 100644 +index bde2eb32d75562feca87e570011eee5629e37075..0882bc86dcfa953b4ef964226422edf7ff94f8fe 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -1808,7 +1808,7 @@ public class ToolbarManager +@@ -1796,7 +1796,7 @@ public class ToolbarManager return mOmniboxFocusStateSupplier.get() || (mToolbarPositionController != null && mToolbarPositionController.doesPrefMismatchPosition()) diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index c6d2fe5a179..05ba2573d7d 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 07d70529c374ad81dda76864598d1d212a426d28..b1d1f17bb8ab387ecc791b57d1c30dc3f514ea4c 100644 +index ae608f51c7ac8d5a6853f18b3dfa6b18d90db01c..002bf9eae6090aa1d5928d1f43fc7ab2148e5a39 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -89,6 +89,7 @@ grit_strings("generated_resources") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index e5471bab263..575fa717bc4 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 68375e1d44734b733c0716a37a5f0a88cbb441d5..76b8f6e83e7c81c5bf08ddb13738773e69901642 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2599,6 +2599,7 @@ static_library("browser") { +@@ -2509,6 +2509,7 @@ static_library("browser") { } else { sources += [ "net/net_error_diagnostics_dialog_stub.cc" ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 7cba2cf77f5..157049b775f 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 bf4fdb761d26edc3a469cad571b68dd111c6322e..6ab28ddb9a2f9610fbbf1c576b41ced5569cf65f 100644 +index 1cb8861af59d093d827c739037765b29d5db7269..0e520cd02fae16ac77772b4696432aec5650286a 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4672,6 +4672,7 @@ const FeatureEntry::FeatureVariation +@@ -4840,6 +4840,7 @@ const FeatureEntry::FeatureVariation kSigninPromoOnAvatarPillVariation[] = { // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-actor-site_policy.cc.patch b/patches/chrome-browser-actor-site_policy.cc.patch index a47993cc25e..316a7e5b99e 100644 --- a/patches/chrome-browser-actor-site_policy.cc.patch +++ b/patches/chrome-browser-actor-site_policy.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/actor/site_policy.cc b/chrome/browser/actor/site_policy.cc -index 04cfedff5a8369e6a29f3e1ac7a9429e4f85d872..90e1d5f38feddade140296fd58123de5a7b214e6 100644 +index 81ff794108a5cb71461270702d0dddb81de219eb..b4030f2e94e119d33832a3f11298c5ee73a4df2c 100644 --- a/chrome/browser/actor/site_policy.cc +++ b/chrome/browser/actor/site_policy.cc @@ -159,6 +159,7 @@ void MayActOnUrlInternal(const GURL& url, diff --git a/patches/chrome-browser-actor-ui-handoff_button_controller.cc.patch b/patches/chrome-browser-actor-ui-handoff_button_controller.cc.patch index 1aab4f5e841..5809730d1c2 100644 --- a/patches/chrome-browser-actor-ui-handoff_button_controller.cc.patch +++ b/patches/chrome-browser-actor-ui-handoff_button_controller.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/actor/ui/handoff_button_controller.cc b/chrome/browser/actor/ui/handoff_button_controller.cc -index 599aa8856525b1dfd581bf31132df3f29d44c7e5..e0ec0f7c93bbab0025fe27d17a8ecb9db62eadc1 100644 +index f7efc4d9584c9c9cd3087d5f5452b0f14268f82f..232a0f87ffeccdd25b35181a54753af59afecb61 100644 --- a/chrome/browser/actor/ui/handoff_button_controller.cc +++ b/chrome/browser/actor/ui/handoff_button_controller.cc -@@ -143,6 +143,7 @@ class GradientBubbleFrameView : public views::BubbleFrameView { +@@ -141,6 +141,7 @@ class GradientBubbleFrameView : public views::BubbleFrameView { auto blur_filter = sk_make_sp( kShadowBlurSigma, kShadowBlurSigma, SkTileMode::kDecal, nullptr); shadow_flags.setImageFilter(std::move(blur_filter)); diff --git a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch index 2f71a74d5bc..0e33dd3472b 100644 --- a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch +++ b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -index f4daf7c490cf9372badc0e63bb46abef811d293d..e07dc258c0441fe47510e52b71b087ab6724de91 100644 +index afb691dd65b1ca382b64a4b598a261bcbe7505bc..b7c74421d99288b99097ace493be97a35b1fe776 100644 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc @@ -119,6 +119,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( diff --git a/patches/chrome-browser-app_controller_mac.mm.patch b/patches/chrome-browser-app_controller_mac.mm.patch index 1c2572c8572..0d753fd1545 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 b7c3520adc628e244069c561fed563ffcb4b7f3f..de5d8bd6e14a0cc10f10f44f556159943a25fe24 100644 +index 50ceb7af41fca9feaefeb7dd34b505c5bef8f375..4a231f1ba56bdcc00f0c332fb41488f6d6eba7a1 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -767,7 +767,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -748,7 +748,7 @@ class AppControllerProfileObserver : public ProfileAttributesStorage::Observer, + (AppController*)sharedController { static AppController* sharedController = [] { @@ -11,7 +11,7 @@ index b7c3520adc628e244069c561fed563ffcb4b7f3f..de5d8bd6e14a0cc10f10f44f55615994 NSApp.delegate = sharedController; return sharedController; }(); -@@ -1442,7 +1442,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -1420,7 +1420,7 @@ class AppControllerProfileObserver : public ProfileAttributesStorage::Observer, } auto it = _profileBookmarkMenuBridgeMap.find(profilePath); diff --git a/patches/chrome-browser-bookmarks-android-BUILD.gn.patch b/patches/chrome-browser-bookmarks-android-BUILD.gn.patch index 1f1b3d5f521..ceca95fc936 100644 --- a/patches/chrome-browser-bookmarks-android-BUILD.gn.patch +++ b/patches/chrome-browser-bookmarks-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/bookmarks/android/BUILD.gn b/chrome/browser/bookmarks/android/BUILD.gn -index 53338f5c94c7fcb38f86ff266e0691a2f1f620a7..a8326001adf62256522da7786ee019ad03519dcb 100644 +index 4f5eacd5f0dcb3e701f4f40ef7a0ad3213852afc..f5703e201a70f6d4f06b419abbb2e1c19fb6664b 100644 --- a/chrome/browser/bookmarks/android/BUILD.gn +++ b/chrome/browser/bookmarks/android/BUILD.gn -@@ -36,6 +36,7 @@ source_set("impl") { +@@ -37,6 +37,7 @@ source_set("impl") { "//components/query_parser", "//components/undo", ] @@ -10,7 +10,7 @@ index 53338f5c94c7fcb38f86ff266e0691a2f1f620a7..a8326001adf62256522da7786ee019ad } android_resources("java_resources") { -@@ -102,6 +103,7 @@ android_library("java") { +@@ -103,6 +104,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarViewBinder.java", "java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarVisibilityProvider.java", ] 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 70f4059119d..375987556e1 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 0ec4102207985715be691d796b1f3b86d5ef32c2..581bd5e22b94d74db9888384ca993a6869300b8d 100644 +index 9c3d04b24d786c7fa72a702b68c22678fc5ac602..a1c9be974801aad1723e13cd27e4312eb8db8df6 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -1625,6 +1625,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix( +@@ -1620,6 +1620,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix( return "WebrtcVideoPerfHistory"; case TracingDataType::kMediaDeviceSalts: return "MediaDeviceSalts"; diff --git a/patches/chrome-browser-chrome_browser_main_mac.mm.patch b/patches/chrome-browser-chrome_browser_main_mac.mm.patch index d13ed57327e..507234184cc 100644 --- a/patches/chrome-browser-chrome_browser_main_mac.mm.patch +++ b/patches/chrome-browser-chrome_browser_main_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm -index bdabbd8c0b3ac3bd947e523ea518918a5912c39b..ef1a76d4adfe2821af0759beb5130f30f19a6360 100644 +index 72445161880b95b6ce7f5ea25692d63c774fca70..b0c3db63fc3fd4cbf50e3f11ab38d8b9b15cb168 100644 --- a/chrome/browser/chrome_browser_main_mac.mm +++ b/chrome/browser/chrome_browser_main_mac.mm -@@ -102,6 +102,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -103,6 +103,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { // ChromeBrowserMainParts should have loaded the resource bundle by this // point (needed to load the nib). CHECK(ui::ResourceBundle::HasSharedInstance()); diff --git a/patches/chrome-browser-content_settings-BUILD.gn.patch b/patches/chrome-browser-content_settings-BUILD.gn.patch index 489cdbbb35e..47cdf28c894 100644 --- a/patches/chrome-browser-content_settings-BUILD.gn.patch +++ b/patches/chrome-browser-content_settings-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/content_settings/BUILD.gn b/chrome/browser/content_settings/BUILD.gn -index 3387a9bdbf5389fe64ca824dcd6fe89d3a6ac7b5..c1ea4e46367046670974b5d066a4200dafc827a5 100644 +index cec67ed273312856031056f6765ce9c196e22ebe..be2cc6c8c66427f06b4518e8000a7c69dabb5dcb 100644 --- a/chrome/browser/content_settings/BUILD.gn +++ b/chrome/browser/content_settings/BUILD.gn @@ -131,6 +131,7 @@ source_set("impl") { diff --git a/patches/chrome-browser-download-download_target_determiner.cc.patch b/patches/chrome-browser-download-download_target_determiner.cc.patch index 5a838682a29..f08b090f674 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 230a1c857445b4f52a0760ab31814bf348cf11cc..4878594786f49e083f92977077fe2b2aa2aceb02 100644 +index 1dd2dbabc1fdcc137eb7e8055d77dfe6c7fd80f5..3950fb71b35dfc2554eae164a74c8b8c410452d6 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1217,6 +1217,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1222,6 +1222,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP; if (HasPromptedForPath() || confirmation_reason_ != DownloadConfirmationReason::NONE || @@ -10,7 +10,7 @@ index 230a1c857445b4f52a0760ab31814bf348cf11cc..4878594786f49e083f92977077fe2b2a user_approved_path) { // If the "DownloadRestrictions" enterprise policy explicitly disallows the // download, don't let the user gesture bypass the dangerous verdict. -@@ -1257,6 +1258,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1262,6 +1263,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-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 42a4bd754a8..0ad28de667e 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 64e7c1122ba874b8199ecaa80ebbac478006a91c..b9154c348bcfd9b9469dfe992c437eedb7010802 100644 +index c7c960abd7ec51fe64b59cf9b13c91cd499d91a1..45906e8db3a0b4578d910cd09d1996ac5f69be6e 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -1570,6 +1570,7 @@ source_set("extensions") { 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 1e99611a62b..fd63b373c79 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 e29ca8a104ad7c3245ea4c12356669417cd67b8b..2089934d85343dc99176c83146fa5411dbf55196 100644 +index 3905ec19874e708bfe4fa889b64050173e3595cf..f61cc0f405d43931342642a226f80e6333493dbf 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -711,6 +711,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension, +@@ -710,6 +710,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension, #else info.incognito_access_pending_change = false; #endif 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 19c2924a203..1ebb4f7470a 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,5 +1,5 @@ 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 c31370fd37850f1630120bb764b2be48599b4d1d..d28675a779cae25ca5e6547020641c7a321d8ac9 100644 +index 9fda95bc0d4b301299aeafafaf3f8cf14c117158..8602c53bd6894f2528c337e4291ddbafcaef04ea 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 @@ -274,6 +274,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() { diff --git a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch index 321b359c6b2..77d3d4a20b7 100644 --- a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch +++ b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc -index 05704d3dd7d9d1b849ffc016f00a13195097be19..b3119e3389b97c4b965e97255065b057bd1c8b68 100644 +index 79a87e4879bb2706f6e97fbafe443c67ba41c536..52ea21a8dcc84afd88f6876a052398dde9c471dd 100644 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -91,6 +91,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest( diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index ff4b2a12428..167a94d80bb 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index bb0e7b5cba7e0ab8853aabdd61b5ac3a75776cc7..aa3c8f6ed5e9342cf315fda13e2c547d4a607e1d 100644 +index 2c809ad23947326b86b5523773cf9159915429cb..fb935ac5bad888fc7e0ad7b39090a3e49b100ea7 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -1152,6 +1152,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext( +@@ -1146,6 +1146,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch index 9abc202707c..445c932d95b 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index 9d7f383e3878f0410ca7e7f34d7941b60847c097..4b9db45c891ea676f0f19c2769bdf26d945b521d 100644 +index 2cdb7e2c503c019f932a5683aafd4902c26c5a17..8f205261f6e3488ca86f2792549498f92a03a749 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -414,7 +414,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( diff --git a/patches/chrome-browser-global_features.cc.patch b/patches/chrome-browser-global_features.cc.patch index 55e06a78257..7fa43ef5555 100644 --- a/patches/chrome-browser-global_features.cc.patch +++ b/patches/chrome-browser-global_features.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/global_features.cc b/chrome/browser/global_features.cc -index e1c76d0788c262d1e2f4fe20329d3a3c31c1d646..9b816385699617b3e9d522f10a841abb2da503e8 100644 +index ef13b8f57457c08bec8d3dc17bfb730945bb6c52..1baa60d6f499167ab5e9a3baefa34df6694dddeb 100644 --- a/chrome/browser/global_features.cc +++ b/chrome/browser/global_features.cc @@ -71,6 +71,7 @@ diff --git a/patches/chrome-browser-importer-BUILD.gn.patch b/patches/chrome-browser-importer-BUILD.gn.patch index 71c9861fd1f..4583b713866 100644 --- a/patches/chrome-browser-importer-BUILD.gn.patch +++ b/patches/chrome-browser-importer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/BUILD.gn b/chrome/browser/importer/BUILD.gn -index 0ad7c3c67529709274db790b8879017f362884b1..1f5c6c8f26b43761061e926619602f0f7063ceb3 100644 +index 0b36e87039987f567294e9a9785583e32f46a5fa..bf8cb3c79264ff713ffd58654bf052789f31849b 100644 --- a/chrome/browser/importer/BUILD.gn +++ b/chrome/browser/importer/BUILD.gn @@ -31,6 +31,7 @@ source_set("importer") { @@ -10,7 +10,7 @@ index 0ad7c3c67529709274db790b8879017f362884b1..1f5c6c8f26b43761061e926619602f0f } source_set("impl") { -@@ -62,6 +63,7 @@ source_set("impl") { +@@ -63,6 +64,7 @@ source_set("impl") { "//components/password_manager/core/browser:password_form", "//components/password_manager/core/browser/password_store:password_store_interface", ] diff --git a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch index 035e4f8a779..3799198c0af 100644 --- a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch +++ b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -index 269ec919d15699715b831ffadcc3525284427803..5c8f6aa405186c2bc2a207d8bc23c24078daaa8b 100644 +index bc31f90d949d574e6469c9504bc8b994d48e2987..8757d82f94c8b04c400d35acafeca7cc01ed5a92 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -431,6 +431,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { 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 360482e19bb..de951088572 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 d0bb264e55f1f962af3f076c2de0eb3911cabfc2..882c149b84b9807711e2df9dbbad4533117aee9b 100644 +index 226a3863950c14af54207906899008d2491f8a27..ef11df29a9d8698eb6c7ba567f01b673c5cab744 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -704,6 +704,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() { +@@ -723,6 +723,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 5c8718b1bec..83d64dbd50b 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 341cae2bda7fce9e5133966cb8670b9858a44654..1b5175a36e7f0084a5d33200bea780b5cf6a3fb0 100644 +index 6cd82a8e621a6bedbd4b538154613cfe69831f07..83c23bd665c30e9e450962ea720a5716967f7051 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -478,7 +478,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem diff --git a/patches/chrome-browser-notifications-BUILD.gn.patch b/patches/chrome-browser-notifications-BUILD.gn.patch index 1ed83d16e66..9d92819c63f 100644 --- a/patches/chrome-browser-notifications-BUILD.gn.patch +++ b/patches/chrome-browser-notifications-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn -index 2abd4ae5a3cd2a3323c46512a93466b79da755a0..8e857946f403c9e2bf27749e9c9e1affbcd4dcf9 100644 +index 4da8bad8d25015672f51467ff1a328a9c41644b4..932cad6c3b68229b9e228203395c90db293ca70f 100644 --- a/chrome/browser/notifications/BUILD.gn +++ b/chrome/browser/notifications/BUILD.gn -@@ -112,6 +112,7 @@ if (is_android) { +@@ -111,6 +111,7 @@ if (is_android) { "//third_party/jni_zero:jni_zero_java", "//ui/android:ui_no_recycler_view_java", ] diff --git a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch index 3ff2cdefbba..4a6c6e5dc2d 100644 --- a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch +++ b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc -index 8a4f88012293e5325b235ff755db6c3cc9a7b426..0af16df24f4e0744c2899d9c56812330763e1979 100644 +index bba7b7b6f668f7c3b7b4ebe27f8b54451817b4b8..3391dd99f0449b5450e9cd4acc8df920934dcb0f 100644 --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc -@@ -119,6 +119,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) +@@ -133,6 +133,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) std::make_unique()); } #endif diff --git a/patches/chrome-browser-password_manager-android-BUILD.gn.patch b/patches/chrome-browser-password_manager-android-BUILD.gn.patch index f02c8642d65..4ec7ca27027 100644 --- a/patches/chrome-browser-password_manager-android-BUILD.gn.patch +++ b/patches/chrome-browser-password_manager-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn -index ce75cb153701f95c54b0938046d43f40827879f7..b32b10c9564fd18515758e3c6b5e71252b77fa6f 100644 +index 032dddbd35beb6673c9466f04e8021fefe0dea9f..fd929399bb1eacf0648703c55bcc000f7a4d7f1c 100644 --- a/chrome/browser/password_manager/android/BUILD.gn +++ b/chrome/browser/password_manager/android/BUILD.gn @@ -189,6 +189,7 @@ android_library("java") { diff --git a/patches/chrome-browser-prefs-BUILD.gn.patch b/patches/chrome-browser-prefs-BUILD.gn.patch index 074b71e442e..45fffce19b7 100644 --- a/patches/chrome-browser-prefs-BUILD.gn.patch +++ b/patches/chrome-browser-prefs-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn -index e7e27da2d113967179a9f9b9f5019bc5e86f81f4..4bfea38dc702c110c4ed139d5022a034d72f78a4 100644 +index c9f76e7418faaa56ec5025d5689649a648f4d326..a2a5d01a92339eec4d94aa1a2049f1cde041675c 100644 --- a/chrome/browser/prefs/BUILD.gn +++ b/chrome/browser/prefs/BUILD.gn -@@ -164,6 +164,7 @@ source_set("impl") { +@@ -170,6 +170,7 @@ source_set("impl") { "//services/preferences/tracked", "//services/preferences/tracked:features", ] diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 8b6ea936c02..2f8c7150b13 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 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52cf062eb12 100644 +index ad6b592b4740392044d151801c80bbf92e7c0f55..290199413b5517fdd3aadea92de10bf1f42f82d5 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1687,6 +1687,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1723,6 +1723,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { false); // This is intentionally last. @@ -10,7 +10,7 @@ index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52c RegisterLocalStatePrefsForMigration(registry); } -@@ -2171,6 +2172,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2220,6 +2221,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif // BUILDFLAG(IS_ANDROID) registry->RegisterBooleanPref(prefs::kStaticStorageQuotaEnabled, false); @@ -18,7 +18,7 @@ index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52c } void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -2593,6 +2595,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, +@@ -2642,6 +2644,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, profile_prefs->ClearPref(kObsoletePasswordsUseUPMLocalAndSeparateStores); profile_prefs->ClearPref(kObsoleteEmptyProfileStoreLoginDatabase); profile_prefs->ClearPref(kObsoleteUpmAutoExportCsvNeedsDeletion); @@ -26,7 +26,7 @@ index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52c base::DeleteFile(profile_path.Append(FILE_PATH_LITERAL("Login Data"))); base::DeleteFile( profile_path.Append(FILE_PATH_LITERAL("Login Data For Account"))); -@@ -2600,6 +2603,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, +@@ -2649,6 +2652,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, profile_path.Append(FILE_PATH_LITERAL("Login Data-journal"))); base::DeleteFile( profile_path.Append(FILE_PATH_LITERAL("Login Data For Account-journal"))); diff --git a/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch b/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch index 2dbb5b09541..33cb8213d91 100644 --- a/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch +++ b/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc -index cf4ebf3d26398785e8ef558eb0b010fe4b752601..2f265b95bbcfa6ae7595b6684b418a466838d9ca 100644 +index 2db4de27556917f5a39ba4f43025bfed268ab671..d5be1b3c73ac5378e7ff2231ee40dd81e7239fa1 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc -@@ -193,6 +193,7 @@ const auto kTrackedPrefs = std::to_array({ +@@ -192,6 +192,7 @@ const auto kTrackedPrefs = std::to_array({ // See note at top, new items added here also need to be added to // histograms.xml's TrackedPreference enum. diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 45dda8dc194..57a7bf502bb 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 64b3e5af4de03e477d91af925bf70d78df398410..c38651d8c4105c82b4ebfded90d56bc43a63abad 100644 +index 9fbd8722baf2ce422c1c12b84780e9ec5111555d..ec953765495582e248958e5f9f822a53b266a78f 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -114,6 +114,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { diff --git a/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch b/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch index 0f56d8510ab..676f04ee9c0 100644 --- a/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch +++ b/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc -index ffe2d52c0bf2b101a796ca8acbc5663ecd97016f..8e4a4ce18b6560920517760e0b8048a7c730b7ec 100644 +index a02025a7d78b64e2774bd62355666c076c671948..1a0263e55294eae3dd3bbcccf01bdea2f3fed8e6 100644 --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -1043,6 +1043,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) { +@@ -1058,6 +1058,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) { // This method should be periodically pruned of year+ old migrations. void ProfileAttributesEntry::MigrateObsoleteProfileAttributes() { diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch index b70b24a87cd..f875949f1be 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c59d3f153 100644 +index e41e3babb1748f0175706cb330e84f607298938a..e5f2e3bfbaf3a9c816c649ff0b72c9cc23df500c 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc -@@ -459,7 +459,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; +@@ -460,7 +460,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; #elif BUILDFLAG(IS_CHROMEOS) constexpr size_t kDefaultAvatarIconsCount = 27; #else @@ -11,7 +11,7 @@ index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c #endif #if !BUILDFLAG(IS_ANDROID) -@@ -625,6 +625,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -626,6 +626,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) @@ -19,7 +19,7 @@ index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -658,6 +659,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -659,6 +660,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); @@ -27,7 +27,7 @@ index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c static const std::array resource_info = {{ // Old avatar icons: -@@ -969,6 +971,7 @@ base::ListValue GetIconsAndLabelsForProfileAvatarSelector( +@@ -971,6 +973,7 @@ base::ListValue GetIconsAndLabelsForProfileAvatarSelector( selected_avatar_idx == GetPlaceholderAvatarIndex()); avatars.Insert(avatars.begin(), base::Value(std::move(generic_avatar_info))); diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 9194379b972..d9689ed8c23 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 6bc3db5c106e40aadc0aec040ed029603387a8fb..aa5f018e5043729b5f61f9db25a89f450474b963 100644 +index db97dc1e4813e3dcdfc8173241c17328e4e040cf..b5f86c1745b5a67ed59154a2125005cc9562ec18 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -570,6 +570,7 @@ void ProfileImpl::TakePrefsFromStartupData() { 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 183ddfd6137..733985be190 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 62cdd2ab941685926c34b90d9858211bdeaaba6f..7f6fb5722c3e9804639f2cc5fc60baf9b79e4cc9 100644 +index 66b08f07c570078a0f0f96d733bd9b7164c9258d..c65b8139c47a29e239882b763cea79cc2772aefa 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2507,6 +2507,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -2464,6 +2464,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 4beeec29730..43dd36667c6 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 5caabda59bb17fb8558b66538eb02f6aedb224f3..86f07dfa90fa3e5ba650f93033dff71eb6ab2e16 100644 +index 5bc2716727784a62cb63f07860bedcba54d6c642..c307411c42495799500f80c4c6b0a6e41866359f 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -200,6 +200,7 @@ class RenderViewContextMenu diff --git a/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch index 12c246e6fc9..759ec57a393 100644 --- a/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/api_listener.ts b/chrome/browser/resources/bookmarks/api_listener.ts -index f3e1f9285ee6f7f2b5b4bfa0edaceb2a9fca4faf..f08c14827d2e5d4d6c9532f101522f0cf321d31c 100644 +index 9a11030816f0baeab6ca81fa08daaf1a6d19350d..87f461437bd0147ff67c9759110a14f2553e5347 100644 --- a/chrome/browser/resources/bookmarks/api_listener.ts +++ b/chrome/browser/resources/bookmarks/api_listener.ts -@@ -118,6 +118,7 @@ function onChildrenReordered( +@@ -120,6 +120,7 @@ function onChildrenReordered( */ function onImportBegan() { chrome.bookmarks.onCreated.removeListener(onBookmarkCreated); @@ -10,7 +10,7 @@ index f3e1f9285ee6f7f2b5b4bfa0edaceb2a9fca4faf..f08c14827d2e5d4d6c9532f101522f0c document.dispatchEvent(new CustomEvent('import-began')); } -@@ -126,6 +127,7 @@ function onImportEnded() { +@@ -128,6 +129,7 @@ function onImportEnded() { dispatch(refreshNodes(normalizeNodes(results[0]!))); }); chrome.bookmarks.onCreated.addListener(onBookmarkCreated); diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch index b551b920b9d..7f3eedfd754 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts -index 21a87921fe01bd811e366c0cf434bc11b34f3007..b0d1278a91dcea593c5e6ad636b9082bd313bf50 100644 +index 52e81dade62c827015d86668aba2cf6c9401f195..c8759a701370b37c840968d32791ea4780081e77 100644 --- a/chrome/browser/resources/bookmarks/command_manager.ts +++ b/chrome/browser/resources/bookmarks/command_manager.ts -@@ -473,7 +473,7 @@ export class BookmarksCommandManagerElement extends +@@ -472,7 +472,7 @@ export class BookmarksCommandManagerElement extends chrome.bookmarkManagerPrivate.export(); break; case Command.HELP_CENTER: diff --git a/patches/chrome-browser-resources-bookmarks-reducers.ts.patch b/patches/chrome-browser-resources-bookmarks-reducers.ts.patch index 6903fc51f51..efaa6bb3aeb 100644 --- a/patches/chrome-browser-resources-bookmarks-reducers.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-reducers.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/reducers.ts b/chrome/browser/resources/bookmarks/reducers.ts -index 72fe9c12d54a93fbad7114e875768e1ba2232cea..1d83343e5e4537a45780e307810452d19edcaec8 100644 +index 7e4e55e64172840f1cb43febceb5d540f5968f31..7f1c92067b6c731d64ff589556c4024bcb915e62 100644 --- a/chrome/browser/resources/bookmarks/reducers.ts +++ b/chrome/browser/resources/bookmarks/reducers.ts @@ -194,6 +194,9 @@ function editBookmark(nodes: NodeMap, action: EditBookmarkAction): NodeMap { @@ -12,7 +12,7 @@ index 72fe9c12d54a93fbad7114e875768e1ba2232cea..1d83343e5e4537a45780e307810452d1 // Change node's parent. nodeModifications[id] = -@@ -429,7 +432,7 @@ export function updateFolderOpenState( +@@ -437,7 +440,7 @@ export function updateFolderOpenState( folderOpenState, nodes[(action as SelectFolderAction).id]!.parentId!, nodes); case 'move-bookmark': diff --git a/patches/chrome-browser-resources-history-synced_device_manager.ts.patch b/patches/chrome-browser-resources-history-synced_device_manager.ts.patch index afa5c4b8bc3..e547769d966 100644 --- a/patches/chrome-browser-resources-history-synced_device_manager.ts.patch +++ b/patches/chrome-browser-resources-history-synced_device_manager.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/history/synced_device_manager.ts b/chrome/browser/resources/history/synced_device_manager.ts -index f5e26215336bcd3b2d8213977a103e87bfbfc154..c6df1ad0d67d5199dd0999aced78a711fd5e187b 100644 +index 0503ed72100275e44e98bbdd460695ffe61061cf..a253ed6e96b20fd50fb61af4fb5cd7f505e7ae6b 100644 --- a/chrome/browser/resources/history/synced_device_manager.ts +++ b/chrome/browser/resources/history/synced_device_manager.ts -@@ -443,10 +443,10 @@ export class HistorySyncedDeviceManagerElement extends +@@ -442,10 +442,10 @@ export class HistorySyncedDeviceManagerElement extends return; } } else if (this.isSignInState_(HistorySignInState.SIGNED_OUT)) { diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index f00d6937822..23a2f29b2de 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 01bd4cfbf9588d70d21db6543b100c61b2950971..927fe2b260fb50bc544ef1717351caa255852d6c 100644 +index da914af0eb958dce35250b05e2bf01388bd40f5f..b9bdf8550ab97cec160068d4fbb144c4afd08a9c 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -505,4 +505,5 @@ build_webui("build") { +@@ -495,4 +495,5 @@ build_webui("build") { "$root_gen_dir/chrome/browser/resources/settings_shared/tsc", root_build_dir) ] } diff --git a/patches/chrome-browser-resources-settings-clear_browsing_data_dialog-clear_browsing_data_dialog_v2.ts.patch b/patches/chrome-browser-resources-settings-clear_browsing_data_dialog-clear_browsing_data_dialog_v2.ts.patch index 8953ed51025..1ba67d3053a 100644 --- a/patches/chrome-browser-resources-settings-clear_browsing_data_dialog-clear_browsing_data_dialog_v2.ts.patch +++ b/patches/chrome-browser-resources-settings-clear_browsing_data_dialog-clear_browsing_data_dialog_v2.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts -index ad5e2480c9f624881eacc3dbc96bdcbb0785c517..b3ee2eec7da02e94c09c69bef9209efd7ca05b1c 100644 +index 60e4e4c2e89a30581df5a189064d2010986656e3..13bc89a3dd0006091b9c2179b84cd684e21d47b6 100644 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts @@ -81,10 +81,12 @@ export interface SettingsClearBrowsingDataDialogV2Element { 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 cadca14379b..6ef1ab9fcdd 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,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index d3c540ea1b2403d102414c3aeb7e85b837452405..f02442fba2dde111c154001eedb440f232d2edf0 100644 +index 4aca8addafc30f254582613b3e9c6673e6baf9b2..ad7d62173c682434d252f68c3b35d6743a655f2d 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -18,6 +18,7 @@ +@@ -11,6 +11,7 @@ on-close="onPrivacyGuideDialogClosed_"> diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index 02973af4250..edd2aab7a2a 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index bab9aa1c1e16592fa23e78c14c3576135de827af..b207c5da0d8f5bb1d03fd595238ffe532f715993 100644 +index 4ab4d784d4fe5b04e6e5406e2a4a4c2399292380..c26e1367c1c900e8272dd03a0b480f9268a5b3fb 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts @@ -16,6 +16,7 @@ import '../icons.html.js'; diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index f569afb9633..1e050cae1f6 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 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd68f7b7cdf 100644 +index 687bc78abc1c780c262fb8193fbf034bb87147a4..847c7eb5f878a67ac30d077ed4e5c005513fdcce 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'; @@ -10,7 +10,7 @@ index 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd6 /** * Add all of the child routes that originate from the privacy route, * regardless of whether the privacy section under basic or advanced. -@@ -326,6 +327,7 @@ function createRoutes(): SettingsRoutes { +@@ -321,6 +322,7 @@ function createRoutes(): SettingsRoutes { loadTimeData.getString('performancePageTitle')); } @@ -18,7 +18,7 @@ index 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd6 return r as unknown as SettingsRoutes; } -@@ -359,7 +361,7 @@ export let routes: SettingsRoutes = Router.getInstance().getRoutes(); +@@ -354,7 +356,7 @@ export let routes: SettingsRoutes = Router.getInstance().getRoutes(); // Returns the "effective" route when at chrome://settings/. export function getTopLevelRoute(): Route { if (!loadTimeData.getBoolean('isGuest')) { diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index 7b0f39bb468..4a960f293c8 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 692a677c7c4d5070907a4ef9cb5a385f58408dc8..99eeb34c42730b8a38e47d09c2e90e2c76115268 100644 +index 98b163bfe8829c6597d4862272dbcadb3f9c5470..e5f8feba4b36e2ad63de31064172c1e72c37d7ae 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-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 54bcc04f83c..62c901366b4 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index 3c614567af955aa39343758a94ccf795c1d2195c..1705b280594749f8b9bfe1e21a34196156a5bb5f 100644 +index 9a7fd9e95e925cc1ac0c5a6d40c1007a338213fb..5e9913fa2bf1a450beeb21248610d2bf10bc4fd9 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts @@ -69,6 +69,7 @@ export enum ContentSettingsTypes { diff --git a/patches/chrome-browser-resources-settings-site_settings-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings-site_settings_page.ts.patch index ff6cd70549d..d0d9ad50de7 100644 --- a/patches/chrome-browser-resources-settings-site_settings-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_page.ts b/chrome/browser/resources/settings/site_settings/site_settings_page.ts -index 4575f9c814d37d9d72e68cdc204a8b205ba5373b..e918767f49f40f9825d3f49fa96333d59e508352 100644 +index 0ae371bd02646d30842994c64b927839033af7ff..f65b5f18b2a897e5421031eac972de6716673477 100644 --- a/chrome/browser/resources/settings/site_settings/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings/site_settings_page.ts @@ -9,6 +9,7 @@ diff --git a/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch b/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch index 8ef1b85e010..0dc4f82ff09 100644 --- a/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch +++ b/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts -index b4c2d9e3d436550dc1dd861c927692df3b291730..0a669cef64a5fc0afce150a72baa010bb9a1d355 100644 +index c9e07b2d289952595ded4d18e542d668137265eb..44fd9ce2311c3ae1ed56a92e079b442c36812800 100644 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts @@ -194,7 +194,8 @@ export class PowerBookmarksListElement extends PolymerElement implements 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 9f668cd4aeb..a01a7de9de1 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 b273323c8702eda5877a23377e85b92a6b117fd6..f6352416b9201383733e5e8617c2e56421fc94ea 100644 +index 4e1fcd93211771a0577ba7b9c70f4dabb62945a8..90b3fe80d5f6ac0cb2f3a4f328121bec875da8ea 100644 --- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn +++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn -@@ -114,7 +114,7 @@ build_webui("build") { +@@ -111,7 +111,7 @@ build_webui("build") { target_gen_dir) ] webui_context_type = "untrusted" diff --git a/patches/chrome-browser-resources-signin-profile_customization-profile_customization_app.ts.patch b/patches/chrome-browser-resources-signin-profile_customization-profile_customization_app.ts.patch index 53c0527fd8d..cdbc8b7927d 100644 --- a/patches/chrome-browser-resources-signin-profile_customization-profile_customization_app.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_customization-profile_customization_app.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts b/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts -index dbc80d81b0f63947c703d0389603574b601b882e..c3cb4021ebb831d247e3f351b56b44f0265c58e6 100644 +index 31a8754dd89d7092bd0d3597c137478452694521..8da008b81350d3d76c11f7147f7f6b3043454fdd 100644 --- a/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts +++ b/chrome/browser/resources/signin/profile_customization/profile_customization_app.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch index 89995b770c5..0579b2e328a 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -index 42daa10da6c8633342802123cb37152cae7f6dc8..d6772c72ba8c2f3b5408072d7c26a0ab1983d6b6 100644 +index 8ffbfea7a978ee2b8d6ba7f268a5776c1d2bd1bc..19701e79556584eaaade1db2c63720e285bcdc4a 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -@@ -155,6 +155,7 @@ export class ProfilePickerMainViewElement extends +@@ -160,6 +160,7 @@ export class ProfilePickerMainViewElement extends } override firstUpdated() { diff --git a/patches/chrome-browser-resources-tab_search-BUILD.gn.patch b/patches/chrome-browser-resources-tab_search-BUILD.gn.patch index 28255ab4e50..6a30eae8d92 100644 --- a/patches/chrome-browser-resources-tab_search-BUILD.gn.patch +++ b/patches/chrome-browser-resources-tab_search-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/tab_search/BUILD.gn b/chrome/browser/resources/tab_search/BUILD.gn -index f9c3c4dc649d0c8bdf1366236fc7e2cc8b2f53fd..e98ea1d43ca4a392ab9ef4304b41ec295da7e9ae 100644 +index 5559ef2d0038dd8d078105f703fe23c26602216c..ba701315f0c266fd42ad6fedef0b33aa8abd1ae8 100644 --- a/chrome/browser/resources/tab_search/BUILD.gn +++ b/chrome/browser/resources/tab_search/BUILD.gn -@@ -130,4 +130,5 @@ build_webui("build") { +@@ -91,4 +91,5 @@ build_webui("build") { "tab_search.js", ] } 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 3d2a18c928d..8ff0034466b 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,8 +1,8 @@ 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 cf0ad8603038fc8574b5c2dc43d63b846dfbd11d..f750f00560b833f45c70f212b559712be17a869b 100644 +index 28fc394196f05c30123953130966c0b4ca1be063..02ac09603f8045f4151163168ba6d2b540a4196a 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 -@@ -335,6 +335,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt( +@@ -338,6 +338,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt( client_download_request_ = std::move(request); request_creation_details_ = details; SanitizeRequest(); diff --git a/patches/chrome-browser-sessions-session_service.cc.patch b/patches/chrome-browser-sessions-session_service.cc.patch index 20c130ec925..2692b7d52d7 100644 --- a/patches/chrome-browser-sessions-session_service.cc.patch +++ b/patches/chrome-browser-sessions-session_service.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc -index 2eaacf40c2473f8d0147d79e99c9432c7d7ffdc3..d925c66c28d2aa2a66b383e31ada67f814e7f8f1 100644 +index 2081a22bf7ccfa12ad943ed7510d3e03ca506e42..943cac60ed3508d1c6e1ce5a76ef98bc409f3f24 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -385,6 +385,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) { diff --git a/patches/chrome-browser-signin-chrome_signin_helper.cc.patch b/patches/chrome-browser-signin-chrome_signin_helper.cc.patch index e5f714b070b..5853a4fdefb 100644 --- a/patches/chrome-browser-signin-chrome_signin_helper.cc.patch +++ b/patches/chrome-browser-signin-chrome_signin_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc -index dfb7b597b28b4e7b740dc4d64343e3a3a9302d88..e866ca9d5a262e0ca82f1a8d692ea858f560d379 100644 +index 3e6b26b0cc5d6f1df1276aa08e35bb05a085e17e..f3cbbfc396c3e12b828df292ab97f42fc230d951 100644 --- a/chrome/browser/signin/chrome_signin_helper.cc +++ b/chrome/browser/signin/chrome_signin_helper.cc @@ -248,6 +248,7 @@ void ProcessMirrorHeader( diff --git a/patches/chrome-browser-signin-signin_promo_util.cc.patch b/patches/chrome-browser-signin-signin_promo_util.cc.patch index 5940f07635b..dcca1c4af6a 100644 --- a/patches/chrome-browser-signin-signin_promo_util.cc.patch +++ b/patches/chrome-browser-signin-signin_promo_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/signin/signin_promo_util.cc b/chrome/browser/signin/signin_promo_util.cc -index 13318216f3429ec12488fbfd07ca93b0b27a73d5..f7fffaf509ae5f1e305923c2482c27fb1fa724c1 100644 +index 2568c43b7684ae69ff6971603018968625bc0703..5bb5c59f067519dd242bd03eae789603eb850d30 100644 --- a/chrome/browser/signin/signin_promo_util.cc +++ b/chrome/browser/signin/signin_promo_util.cc -@@ -377,6 +377,7 @@ bool ShouldShowPromoBasedOnImpressionOrDismissalCount(Profile& profile, +@@ -480,6 +480,7 @@ bool ShouldShowPromoBasedOnImpressionOrDismissalCount(Profile& profile, // `ShouldShowAddressSignInPromo` and `ShouldShowPasswordSignInPromo`). // `profile` is the profile of the tab the promo would be shown on. bool ShouldShowSignInPromoCommon(Profile& profile, SignInPromoType type) { diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index c75f14873c4..e16c0c7b697 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cfe2bc2b3e 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -772,6 +772,7 @@ static_library("ui") { +@@ -799,6 +799,7 @@ static_library("ui") { # gets componentized. "//chrome/browser/ui/extensions:impl", ] @@ -10,7 +10,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf if (enable_vr && is_win) { deps += [ "//chrome/browser/vr:vr_base" ] -@@ -3369,7 +3370,10 @@ static_library("ui") { +@@ -3442,7 +3443,10 @@ static_library("ui") { "//chrome/updater/app/server/win:updater_legacy_idl", ] } else { @@ -22,7 +22,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf } } -@@ -5521,6 +5525,7 @@ static_library("ui_public_dependencies") { +@@ -5556,6 +5560,7 @@ static_library("ui_public_dependencies") { "//components/enterprise/buildflags", "//components/paint_preview/buildflags", "//components/safe_browsing:buildflags", @@ -30,7 +30,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf "//components/segmentation_platform/public", "//components/sync", "//components/sync_user_events", -@@ -5532,6 +5537,7 @@ static_library("ui_public_dependencies") { +@@ -5568,6 +5573,7 @@ static_library("ui_public_dependencies") { if (enable_extensions_core) { public_deps += [ "//extensions/browser" ] } @@ -38,7 +38,7 @@ index ec0d91aca6509e1fa9e93cb24c75a41dc0855154..60fc2a0429b53b08273e934df339e7cf if (!is_android) { public_deps += [ "//build:branding_buildflags", -@@ -5672,6 +5678,7 @@ source_set("browser_navigator_params_headers") { +@@ -5707,6 +5713,7 @@ source_set("browser_navigator_params_headers") { "//url", ] deps = [] 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 2026b03e8d0..aebba22e132 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 faf125bfd6439aa0e4add87c965d5f970d848432..c13cb49a532b8c09aef9477be8143ce51a17da34 100644 +index e7028788b77e6818ada071febd6fc3198b7b9721..133f224ec79e7c14336840c0595098281ae2cd9b 100644 --- a/chrome/browser/ui/actions/chrome_action_id.h +++ b/chrome/browser/ui/actions/chrome_action_id.h -@@ -554,6 +554,7 @@ +@@ -556,6 +556,7 @@ /* Side Panel items */ \ E(kActionSidePanelShowAboutThisSite) \ E(kActionSidePanelShowAssistant) \ @@ -10,7 +10,7 @@ index faf125bfd6439aa0e4add87c965d5f970d848432..c13cb49a532b8c09aef9477be8143ce5 E(kActionSidePanelShowBookmarks, IDC_SHOW_BOOKMARK_SIDE_PANEL) \ E(kActionSidePanelShowComments, IDC_SHOW_COMMENTS_SIDE_PANEL) \ E(kActionSidePanelShowCustomizeChrome) \ -@@ -601,6 +602,7 @@ +@@ -603,6 +604,7 @@ E(kActionCopyUrl, IDC_COPY_URL) \ E(kActionTabGroupsMenu, IDC_SAVED_TAB_GROUPS_MENU) \ E(kActionTabSearch, IDC_TAB_SEARCH) \ diff --git a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch index a652f8e8ff4..22796ad2d20 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn -index 6912b8350e11908daa03dfb46b8182116a419b67..1ae9428477ab08ee71a57abb1e0e7fb1f7ed995d 100644 +index a25d9c20fbc5f4c933110507cc00d3f55f5ed8c6..6624942394614c3e1583bba317ac774423854ecd 100644 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn @@ -22,6 +22,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index 4b56239e0fd..3fdcc722713 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -index 01b772b110ecde4516e6822e8fb8b6cb106abd47..d8fadd251c8e0ea3a9acdf9677ca8683f408ec5e 100644 +index 55bc6a30474d7cb199a6b2740682dd348542664a..e4bc66e1f9eacf886c1dc2a0707c20c577bf554d 100644 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -471,6 +471,7 @@ class AppMenu implements OnKeyListener { +@@ -475,6 +475,7 @@ class AppMenu implements OnKeyListener { anchorView, anchorViewOffset); diff --git a/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch b/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch index 62356913923..f22b8d072be 100644 --- a/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch +++ b/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml -index cc6cadbfbdb44093896ae82798c19de29bc1a9d2..c86fe7510d2530f6eeae8365a76c3cd3cceead0d 100644 +index 7b530c1336918261f959d8b4c7e0ea3dfaf5387e..88705aae6cf81054ead96d4f6c7a98e200f8a926 100644 --- a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml +++ b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml -@@ -60,6 +60,7 @@ found in the LICENSE file. +@@ -50,6 +50,7 @@ found in the LICENSE file. app:layout_constraintTop_toBottomOf="@id/location_bar_attachments" app:layout_constraintEnd_toStartOf="@id/margin_spacer"/> @@ -10,7 +10,7 @@ index cc6cadbfbdb44093896ae82798c19de29bc1a9d2..c86fe7510d2530f6eeae8365a76c3cd3 -@@ -94,7 +95,7 @@ found in the LICENSE file. +@@ -84,7 +85,7 @@ found in the LICENSE file. android:contentDescription="@string/accessibility_toolbar_btn_delete_url" android:tooltipText="@string/accessibility_toolbar_btn_delete_url" app:layout_constraintTop_toBottomOf="@id/location_bar_attachments" diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 24e45e69ea9..c7e05e8ffb0 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 3808e0d4ae7927ddc5c5ae104708a3097308b49b..fa2a9f4641a10c49b4a5ba2a8420338be7f15b43 100644 +index 6c73054568e72484304e06fe3118c84c0391528c..0af12fc2fb30767c0244a2e7f11eb1a50a63e26b 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -146,6 +146,7 @@ android_library("core_java") { +@@ -138,6 +138,7 @@ android_library("core_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", ] @@ -10,7 +10,7 @@ index 3808e0d4ae7927ddc5c5ae104708a3097308b49b..fa2a9f4641a10c49b4a5ba2a8420338b deps = [ ":java_resources", -@@ -354,6 +355,7 @@ android_resources("java_resources") { +@@ -346,6 +347,7 @@ android_resources("java_resources") { "//components/browser_ui/styles/android:java_resources", "//ui/android:ui_java_resources", ] diff --git a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch index de0f2b02251..a560a3b6bf5 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml -index 7dd5a613d32d59b6127c1acfbb3e893cafc52c91..5dba5471a1c88da34cdc1455af4bf5519aebcf04 100644 +index 38d66204d2cb9aa78382fc10cf5538e6d85463e3..8720bbfc4eb26aa128c36a3b5d98db00e63cb884 100644 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml -@@ -53,9 +53,11 @@ found in the LICENSE file. +@@ -46,9 +46,11 @@ found in the LICENSE file. android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" 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 ffda299e90d..15449bfe4c7 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,8 +1,8 @@ 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 1cccb68181828003d6b99ae39c531513bb5ae4b5..aa0586dd47d8be0ae5a10b33888c702da5f1046c 100644 +index 7ffcd089ce8b3292c67a64811d22601ad4e0feed..86cca63f44af183f30b5efc07cff9d93dacbebac 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 -@@ -78,6 +78,7 @@ found in the LICENSE file. +@@ -79,6 +79,7 @@ found in the LICENSE file. android:background="@drawable/modern_toolbar_tablet_text_box_background" android:paddingEnd="@dimen/location_bar_end_padding" android:clipToPadding="false" /> 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 722b3786e2c..1014f06bb1d 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 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3b091b85d 100644 +index 5f8529453b0c4b3b210d2bfee27f6adb3138a70b..26cc200fd4834a6faae72f284189008c207a8c88 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 -@@ -585,6 +585,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -576,6 +576,7 @@ public class ToolbarPhone extends ToolbarLayout if (mOptionalButtonCoordinator != null) { mOptionalButtonCoordinator.setBackgroundColorFilter(color); } @@ -10,7 +10,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3 } private void updateModernLocationBarCorners() { -@@ -1259,6 +1260,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1250,6 +1251,7 @@ public class ToolbarPhone extends ToolbarLayout * Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { @@ -18,7 +18,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3 TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); if (isInTabSwitcherMode()) return; -@@ -1661,6 +1663,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1652,6 +1654,7 @@ public class ToolbarPhone extends ToolbarLayout canvas.restore(); } @@ -26,7 +26,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3 // Draw the tab stack button and associated text if necessary. if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) { // Draw the tab stack button image. -@@ -2025,6 +2028,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2016,6 +2019,7 @@ public class ToolbarPhone extends ToolbarLayout @Override public void onHomeButtonIsEnabledUpdate(boolean homeButtonEnabled) { mIsHomeButtonEnabled = homeButtonEnabled; @@ -34,7 +34,7 @@ index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3 updateButtonVisibility(); } -@@ -2431,6 +2435,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2416,6 +2420,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 6b94cfae618..d535e8f2bc9 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 31e47d759a66b2dda7e9f7885de02bb09ddbf814..21a10d0bc27b55d399751805d29f3fefc6b306f4 100644 +index a800ebc6dbb49e609b90a352122d9ebbb06c4906..f8eb6eab8f12c5a74cc388151c0738be8ad7a267 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 -@@ -286,6 +286,7 @@ public class ToolbarTablet extends ToolbarLayout { +@@ -290,6 +290,7 @@ public class ToolbarTablet extends ToolbarLayout { mLocationBar.getTabletCoordinator().tintBackground(textBoxColor); mLocationBar.updateVisualsForState(); setToolbarHairlineColor(color); diff --git a/patches/chrome-browser-ui-autofill-BUILD.gn.patch b/patches/chrome-browser-ui-autofill-BUILD.gn.patch index 21fbb951be1..b74c74c55d7 100644 --- a/patches/chrome-browser-ui-autofill-BUILD.gn.patch +++ b/patches/chrome-browser-ui-autofill-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/autofill/BUILD.gn b/chrome/browser/ui/autofill/BUILD.gn -index 7c3e3f94b6fd2..147f58ff2a214 100644 +index e59abb96c6dcd8a6626bcbe836842fe15e240925..45b2a5e1ca3953c0f7bd78f6ca4a064ff1898144 100644 --- a/chrome/browser/ui/autofill/BUILD.gn +++ b/chrome/browser/ui/autofill/BUILD.gn -@@ -239,6 +239,7 @@ source_set("impl") { +@@ -241,6 +241,7 @@ source_set("impl") { "//components/password_manager/core/browser/features:password_features", "//components/plus_addresses/core/browser/resources/strings", ] diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index b97e64a2dfb..956b55f3cf8 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0ab3189f7 100644 +index dd77f2fda3db2e7974003085a22981cad3f6c794..50dcdd6351f18dad5be5928ca8b6db49610769d8 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -544,7 +544,7 @@ Browser* Browser::Create(const CreateParams& params) { +@@ -555,7 +555,7 @@ Browser* Browser::Create(const CreateParams& params) { // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -11,7 +11,7 @@ index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0 Browser* const browser_ptr = browser.get(); BrowserManagerServiceFactory::GetForProfile(params.profile) ->AddBrowser(std::move(browser)); -@@ -560,7 +560,7 @@ std::unique_ptr Browser::DeprecatedCreateOwnedForTesting( +@@ -571,7 +571,7 @@ std::unique_ptr Browser::DeprecatedCreateOwnedForTesting( // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -20,7 +20,7 @@ index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0 BrowserManagerServiceFactory::GetForProfile(params.profile) ->AddBrowserForTesting(browser.get()); return browser; -@@ -573,7 +573,7 @@ Browser::Browser(const CreateParams& params) +@@ -584,7 +584,7 @@ Browser::Browser(const CreateParams& params) window_(nullptr), tab_strip_model_delegate_( std::make_unique(this)), @@ -29,7 +29,7 @@ index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0 tab_strip_model_delegate_.get(), params.profile, // Tab groups are disabled for app browsers. -@@ -1321,6 +1321,7 @@ void Browser::OnWindowClosing() { +@@ -1294,6 +1294,7 @@ void Browser::OnWindowClosing() { if (tab_restore_service && notify_restore_service) { tab_restore_service->BrowserClosing(GetFeatures().live_tab_context()); } diff --git a/patches/chrome-browser-ui-browser_commands.cc.patch b/patches/chrome-browser-ui-browser_commands.cc.patch index 9644c5f188f..3e3c4e83710 100644 --- a/patches/chrome-browser-ui-browser_commands.cc.patch +++ b/patches/chrome-browser-ui-browser_commands.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc -index 3f477375e099dfb2f60c035b34318a593f7eaf5f..5a58254cafb2185f4f0f7042accd2733434e681f 100644 +index 657cd294df1d3ca983d6fe2b6ca43d92ded569f9..221e5e3f09e48d587e2a650655f8aa96ba16896b 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -1159,6 +1159,7 @@ void CloseTab(BrowserWindowInterface* browser) { +@@ -1182,6 +1182,7 @@ void CloseTab(BrowserWindowInterface* browser) { } ToastController* toast_controller = browser->GetFeatures().toast_controller(); diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index 958c8dc6c16..b6e25fc97cb 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index b5c2da1226eaef4c5aa7a60cd8ba3ff0e3f46a44..c4fdcc07ac06b9c6871e0d4f4cd10f5ef431642c 100644 +index dab09c63a53bbe0abd8ef305a1991df8eb3f9cc8..ec75b47ec5bfbf5c38cd17fc951ea18860b5b24b 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -559,6 +559,7 @@ base::WeakPtr Navigate(NavigateParams* params) { diff --git a/patches/chrome-browser-ui-browser_ui_prefs.cc.patch b/patches/chrome-browser-ui-browser_ui_prefs.cc.patch index 2d1c7cc4640..9710392e9d7 100644 --- a/patches/chrome-browser-ui-browser_ui_prefs.cc.patch +++ b/patches/chrome-browser-ui-browser_ui_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc -index 837e75e79bac19250455c0c995e96a55ce4cdeb8..d882a46512cddbecf5a22e43cce1c2ceb8c35a8d 100644 +index 771d84612a86fba2482b4ecff6f4920522343725..b5e43e56072adaa3cd09582eb12b2fd3c9cc9d2c 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -130,7 +130,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -133,7 +133,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); registry->RegisterBooleanPref( translate::prefs::kOfferTranslateEnabled, true, diff --git a/patches/chrome-browser-ui-browser_window-BUILD.gn.patch b/patches/chrome-browser-ui-browser_window-BUILD.gn.patch index 1a1087f5ed0..15cf0b0b9f3 100644 --- a/patches/chrome-browser-ui-browser_window-BUILD.gn.patch +++ b/patches/chrome-browser-ui-browser_window-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser_window/BUILD.gn b/chrome/browser/ui/browser_window/BUILD.gn -index 1a64c7b6ff3c7dec0bc652e994e89d8523b70ba3..d60b5a3adc26c4e19403d40644226e82f68ebff9 100644 +index 0494a03994362ed28e7591cfdb7f95a021aab6e6..d304a39e9077a5695d06c9c3368f2afccc2e8419 100644 --- a/chrome/browser/ui/browser_window/BUILD.gn +++ b/chrome/browser/ui/browser_window/BUILD.gn @@ -34,6 +34,7 @@ source_set("browser_window") { diff --git a/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch b/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch index 88e8328e532..4bf3d794ab6 100644 --- a/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser_window/internal/BUILD.gn b/chrome/browser/ui/browser_window/internal/BUILD.gn -index 14b978d8b87d58b1bee198f7a9b239b996c2c42d..9fc139b1964a2f96e6465dc17a079c6205ad9c61 100644 +index f17e7a8a64ff5f86b943821fcb6520298804fb14..fa2a0a766029dc0281f3134feacc1775bbefd35a 100644 --- a/chrome/browser/ui/browser_window/internal/BUILD.gn +++ b/chrome/browser/ui/browser_window/internal/BUILD.gn @@ -149,6 +149,7 @@ source_set("internal") { diff --git a/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch b/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch index d0c083fd834..39f3e558fef 100644 --- a/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch +++ b/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_window/public/browser_window_features.h b/chrome/browser/ui/browser_window/public/browser_window_features.h -index 879b8f11bffc3977902bf290c3ca0bf14b61c651..cdf4aa6edd3ca361be154bc6cbc4e3c936c27b5b 100644 +index 2bdba2a8de29e3e097b03bcc5d53558fcc7783f6..1a6d868d5fa1c33e49b5d41aa9e4e1e2699889eb 100644 --- a/chrome/browser/ui/browser_window/public/browser_window_features.h +++ b/chrome/browser/ui/browser_window/public/browser_window_features.h -@@ -228,7 +228,7 @@ class SkillsUiWindowController; +@@ -230,7 +230,7 @@ class SkillsUiWindowController; class BrowserWindowFeatures { public: BrowserWindowFeatures(); diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index fea9d14df41..82c1468022a 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index d55eb8f03c8fd475ed887ff39d5bae08a950ba21..200372820c736c978e0f9654692bbf73607f752c 100644 +index e05fb064e75b72206b90347cc9925cc1011f0e7e..13cf6903c5efbe0199c89a8958e8cb2730d99e57 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -436,7 +436,7 @@ void ShowSlow(Browser* browser) { +@@ -422,7 +422,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-color-BUILD.gn.patch b/patches/chrome-browser-ui-color-BUILD.gn.patch index e9808fbd89a..76485d22186 100644 --- a/patches/chrome-browser-ui-color-BUILD.gn.patch +++ b/patches/chrome-browser-ui-color-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/color/BUILD.gn b/chrome/browser/ui/color/BUILD.gn -index db1a2f393af2b561cb7d13861bc37f81ab3227c8..a3db53b7c2f43c628aade17d5e68aef88e51f919 100644 +index 6fff64b1b670e44f9222e26643d1a3ebfed67344..444bb43055553740bc9f0f6d8264d27210fad1c0 100644 --- a/chrome/browser/ui/color/BUILD.gn +++ b/chrome/browser/ui/color/BUILD.gn -@@ -62,6 +62,7 @@ source_set("mixers") { +@@ -64,6 +64,7 @@ source_set("mixers") { "//ui/color", "//ui/color:mixers", ] diff --git a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch index ee1789cc981..26153a03be0 100644 --- a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch +++ b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc -index 9f316f14815790dc40cfc83ce6f8211f3d0545b8..457a8f8fcf86bb18096a9e7807b33ff0f25fb721 100644 +index 116fe8437b07e0b0821f8b5e9e09bba6ddbb96e4..95c02046c23b6ba7fa4722772c01a669a1291f40 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc @@ -179,6 +179,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { diff --git a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.h.patch b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.h.patch index 6cedd14d33a..c3cc733262a 100644 --- a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.h.patch +++ b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.h b/chrome/browser/ui/extensions/icon_with_badge_image_source.h -index e95e8f113eba9331506a8559df8bc9af6be2bc67..466aab3cbc69e9803877a4c5a7dc0bd3cdb8b59d 100644 +index e9cb1be92f1f08c376c4b94ca9b98569319587a8..84450c167d75b3319f299b8ccdf6c482804cecb1 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.h +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.h @@ -62,6 +62,7 @@ class IconWithBadgeImageSource : public gfx::CanvasImageSource { diff --git a/patches/chrome-browser-ui-incognito_allowed_url.cc.patch b/patches/chrome-browser-ui-incognito_allowed_url.cc.patch index 196f67b0e7a..c4a64383197 100644 --- a/patches/chrome-browser-ui-incognito_allowed_url.cc.patch +++ b/patches/chrome-browser-ui-incognito_allowed_url.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/incognito_allowed_url.cc b/chrome/browser/ui/incognito_allowed_url.cc -index 455d54eea959545c66d1ab34eb8a8a12ee5abd66..878c7cf9a2a0b0b7c6700acbeea7de03d92a2e87 100644 +index 27bfd067a20f28c6c84eb0c8590507589eed87ea..48a60b4cffb62d71751c2bb1c08882eaf478787c 100644 --- a/chrome/browser/ui/incognito_allowed_url.cc +++ b/chrome/browser/ui/incognito_allowed_url.cc -@@ -68,6 +68,7 @@ bool IsURLAllowedInIncognito(const GURL& url) { +@@ -72,6 +72,7 @@ bool IsURLAllowedInIncognito(const GURL& url) { } return stripped_url.is_valid() && IsURLAllowedInIncognito(stripped_url); } diff --git a/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch b/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch index ea49ef6dd45..d6462ada917 100644 --- a/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch +++ b/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java -index f6df6411a4e3262f5732885f7bd6eecdae20387d..4f8fb59f2019742739b78a0329e9697bcb160aaa 100644 +index 28f3cee253ea8c7c246554f5fad1e91a5ab12e81..e9b6829b40cf8ad9e24e3664f31c32d2504f4f30 100644 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java -@@ -400,7 +400,7 @@ public class SnackbarManager +@@ -431,7 +431,7 @@ public class SnackbarManager boolean viewChanged = true; if (mView == null) { mView = 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 99724ecacbf..58fb49d4b11 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 7a42621caffa4971e649f9682b7bedc96e25d731..d83f2ea12af7ff22d88de57623cf3b05b0346585 100644 +index c9088e8e3a34a350094b6ffb42c3d6ff583bc8f4..510eb1f4e4762f5f725dd793f19dd258b607a5c2 100644 --- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h +++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h @@ -27,7 +27,7 @@ namespace omnibox { diff --git a/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch b/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch index 897aafdd5b8..97544f6e552 100644 --- a/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch +++ b/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc -index b3b8cab34e45976c545a17830377dd324eb42b48..9648d8e6d3367157125fe599da9ff9c110b8f7f0 100644 +index 288909c365d235c2d02e0162890ca0bb3eb708f5..5d35bf75472cbd0cd3037f80ca47083fd9d41445 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc -@@ -658,6 +658,7 @@ void OmniboxEditModel::StartAutocomplete(bool has_selected_text, +@@ -663,6 +663,7 @@ void OmniboxEditModel::StartAutocomplete(bool has_selected_text, input_.set_lens_overlay_suggest_inputs(*suggest_inputs); } diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index a1b8a521888..539160f7f9c 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 3eef54036784743b2e764ea1763905396e28387a..f30417fd64a55f593959e04e706c720c23b74bf7 100644 +index 6c3874b43f7fe707addcee98190657e282f52b57..8a8f47f5219bb1c29eaf3d770175dfde297ebc33 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -796,4 +796,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -819,4 +819,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-public-tab_features.h.patch b/patches/chrome-browser-ui-tabs-public-tab_features.h.patch index 9f351f59670..c236868092f 100644 --- a/patches/chrome-browser-ui-tabs-public-tab_features.h.patch +++ b/patches/chrome-browser-ui-tabs-public-tab_features.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/public/tab_features.h b/chrome/browser/ui/tabs/public/tab_features.h -index f1220cd85bc91782a1a5adcfcfbaef350b5a10a1..59aff2e2ea6f87fc40d7dcac8b98fa0db51af09d 100644 +index f4ecae66f8facedf03790bedfae965f18620191e..73775e8d2c5ae406b68a42c64905526afba33a3c 100644 --- a/chrome/browser/ui/tabs/public/tab_features.h +++ b/chrome/browser/ui/tabs/public/tab_features.h -@@ -177,7 +177,7 @@ class TabInterface; +@@ -194,7 +194,7 @@ class TabInterface; class TabFeatures { public: TabFeatures(); 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 c8933c236b3..d91b51a1168 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 09d9cf4829384ec599049658cfb67565274cb970..2ea7efd64b40d858ac9cd04f86831e0a7e22e834 100644 +index 53dbacdb3bb81881eb48f6979a01891dc5aa13c6..c6b676e5bde6cc4c5cf3b1303567dc69c872789b 100644 --- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc @@ -520,6 +520,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { diff --git a/patches/chrome-browser-ui-tabs-tab_model.cc.patch b/patches/chrome-browser-ui-tabs-tab_model.cc.patch index 89cb167370c..2c778f9aeaf 100644 --- a/patches/chrome-browser-ui-tabs-tab_model.cc.patch +++ b/patches/chrome-browser-ui-tabs-tab_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/tab_model.cc b/chrome/browser/ui/tabs/tab_model.cc -index 6283f2549826f5f333d280dab1c3d02ce0ae2973..006a08acdc20a6501d3bbb5f11033da6a85d6b70 100644 +index cb3ff64566f2a690c999efc0bdf723276b39837b..b62e4807d9c548c34b5aadcc0973ab8202cec726 100644 --- a/chrome/browser/ui/tabs/tab_model.cc +++ b/chrome/browser/ui/tabs/tab_model.cc @@ -56,7 +56,7 @@ TabModel::TabModel(std::unique_ptr contents, 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 597701e8fa8..9dae2c1df5a 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index f7dd86abd83e01f2567b3a3354a7987c50a3e4a4..bda7af9bf9271d38b154e134624bb3df9817d04c 100644 +index d88080f753fd81084f44af2cafa18a71bd37422f..d63c85bc5ffc2e1a25f9784c7cb0a0c840dbc633 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -212,6 +212,7 @@ class TabStripModel { +@@ -211,6 +211,7 @@ class TabStripModel { TabStripModel(const TabStripModel&) = delete; TabStripModel& operator=(const TabStripModel&) = delete; diff --git a/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch b/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch index b03265e6b80..eb7a8e08686 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_prefs.cc b/chrome/browser/ui/tabs/tab_strip_prefs.cc -index 09bd26bf7c26a84ad9b1e766dfd15fdbf2b4285c..f29bb60426378b420b07e9d6f95f85274bdaa8fa 100644 +index a82eac2eb9aaffc77fa6e971b8a5d016d5d5ad06..9649d113500d160c5fd0f6b157073dd2455ec481 100644 --- a/chrome/browser/ui/tabs/tab_strip_prefs.cc +++ b/chrome/browser/ui/tabs/tab_strip_prefs.cc -@@ -20,6 +20,7 @@ std::optional g_tab_search_trailing_tabstrip_at_startup = std::nullopt; +@@ -26,6 +26,7 @@ std::optional g_tab_search_trailing_tabstrip_at_startup = std::nullopt; namespace tabs { bool GetDefaultTabSearchRightAligned() { diff --git a/patches/chrome-browser-ui-tabs-tab_style.h.patch b/patches/chrome-browser-ui-tabs-tab_style.h.patch index 0bb5e5fb8d1..acbef6423b5 100644 --- a/patches/chrome-browser-ui-tabs-tab_style.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_style.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/tab_style.h b/chrome/browser/ui/tabs/tab_style.h -index d564bcf9b6592b673029479b7021e97c4259925d..d9602f8803b52653f602b96a5a11288e3ec35d6c 100644 +index ebb6b8bf2d092ade5f014306514e2006d49bfd3d..82218fa9b5a19570e18c0cd2462a6f6ed2f92d89 100644 --- a/chrome/browser/ui/tabs/tab_style.h +++ b/chrome/browser/ui/tabs/tab_style.h @@ -111,7 +111,7 @@ class TabStyle { 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 a8c9f013eb9..b1c0555e4b9 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,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 0aa98f687c0fdc6b0b5cf5bf46fd18f7c4039c53..81152b1dc7f76b4484b3bc97f7cf9225430adbee 100644 +index 50ce0608cab851cc461971f94bf7876d531d8d13..e048f65501621f1d67efa2750c0045918669fd23 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -894,6 +894,7 @@ void BookmarkBarView::Layout(PassKey) { +@@ -901,6 +901,7 @@ void BookmarkBarView::Layout(PassKey) { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch index 7697d980e5e..5bbdb28ac13 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/ index 6b91efeea31ba927aff9c2f0a8891b96fbd6804e..5c35de3ccf6018e37b13712f79d806b1cbed7ab0 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -@@ -513,6 +513,7 @@ void BookmarkBubbleView::ShowBubble(views::View* anchor_view, +@@ -549,6 +549,7 @@ void BookmarkBubbleView::ShowBubble(views::View* anchor_view, dialog_model_builder.Build(), anchor_view, views::BubbleBorder::TOP_RIGHT); bookmark_bubble_ = bubble.get(); diff --git a/patches/chrome-browser-ui-views-bubble-webui_bubble_manager.h.patch b/patches/chrome-browser-ui-views-bubble-webui_bubble_manager.h.patch index 758a72e876a..5e0a8c498d4 100644 --- a/patches/chrome-browser-ui-views-bubble-webui_bubble_manager.h.patch +++ b/patches/chrome-browser-ui-views-bubble-webui_bubble_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bubble/webui_bubble_manager.h b/chrome/browser/ui/views/bubble/webui_bubble_manager.h -index f343b57043077eca60a396477d62129ee84461e1..f6f9c55055875311affca78275f65eefba3f7ac0 100644 +index 62fd5c2aa247ebb0b0e4ea75f5403ff8c102f3f4..33bdd7bbf945730791d37f2a6e3eddeab5568090 100644 --- a/chrome/browser/ui/views/bubble/webui_bubble_manager.h +++ b/chrome/browser/ui/views/bubble/webui_bubble_manager.h -@@ -165,10 +165,12 @@ class WebUIBubbleManagerImpl : public WebUIBubbleManager { +@@ -164,10 +164,12 @@ class WebUIBubbleManagerImpl : public WebUIBubbleManager { private: // WebUIBubbleManager: diff --git a/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch b/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch index e78b34816c1..3d11049d1ac 100644 --- a/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc b/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc -index b9a8d967d1d56c4aff8edc00fa7ca6e9774e1d1b..da76645e5edb10d6857c9730d85b4e740d8ed3a8 100644 +index 588b759330df53cfdb2015b33e9bc61d4a66597b..de28e04808c64c9ea6004bba996b3cf116446fd6 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc -@@ -359,6 +359,7 @@ void ExtensionsMenuDelegateDesktop::OnUserPermissionsSettingsChanged() { +@@ -402,6 +402,7 @@ void ExtensionsMenuDelegateDesktop::OnUserPermissionsSettingsChanged() { } void ExtensionsMenuDelegateDesktop::OpenMainPage() { 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 c60e368849b..c5fba072565 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,5 +1,5 @@ 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 08a986e57fbe38d12570715cf3cf2e92a375e4e3..8b242d39e96070d9c4621d7b84c0a5e85420766e 100644 +index 422bf37acb26c6c2fd4c8df72d646e075b3a478a..26b746f7f6b52ca3e8d60a26582c33e765032ed4 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 @@ -199,6 +199,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuEntry( diff --git a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch b/patches/chrome-browser-ui-views-frame-browser_view.cc.patch index 7fc9c07aca1..9c14c84d50d 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.cc.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/v index e4d4e62095f96c75e9c88869dc867ee2e1cd2b62..613744bc89e8d2ef4e286d900f50b81bba8f5416 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -629,6 +629,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) { +@@ -628,6 +628,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) { DCHECK(src); DCHECK(dst); DCHECK(point); diff --git a/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.cc.patch b/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.cc.patch index e1376dbfa36..289e75d5a1f 100644 --- a/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.cc.patch +++ b/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc -index 2706421080674da2cd4e02e32bdbcdcb7bdf4bd1..863c4800a1f9ca94feed00ebd59f91752c44a6db 100644 +index f58acb61576d77fd77303344c098de4ed67134b2..c62f18f5dca776fe25a7abaa581d4fa88897a086 100644 --- a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc -@@ -134,7 +134,7 @@ std::unique_ptr CreateTabStrip( +@@ -159,7 +159,7 @@ std::unique_ptr CreateTabStrip( std::unique_ptr hover_card_controller( std::make_unique(tab_strip_region_view, browser_view->browser())); diff --git a/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch b/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch index 3a851427767..00bc057f7f1 100644 --- a/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h -index dc7ac8a7a850cb675ba82eeceef79acd3240a342..302b1d79d1c9de96b4e0697aa7764a9abb75179c 100644 +index d1098733c4f4c83793dd16d94088ea59b579d0b2..2815fb2019dceb081709dbe3d8beac958c9699bb 100644 --- a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h +++ b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h -@@ -33,7 +33,7 @@ class TabStripControlButton; +@@ -35,7 +35,7 @@ class TabStripFlatEdgeButton; // Container for the tabstrip and the other views sharing space with it - // with the exception of the caption buttons. diff --git a/patches/chrome-browser-ui-views-frame-layout-browser_view_tabbed_layout_impl.cc.patch b/patches/chrome-browser-ui-views-frame-layout-browser_view_tabbed_layout_impl.cc.patch index e75cfb9071d..cc470f35bd8 100644 --- a/patches/chrome-browser-ui-views-frame-layout-browser_view_tabbed_layout_impl.cc.patch +++ b/patches/chrome-browser-ui-views-frame-layout-browser_view_tabbed_layout_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc b/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc -index 2ad3b0006ad010ac82a50fa8b3b197ea13ae74ee..8a4804ce12c865d7a6384e0c406b3f966fd121ee 100644 +index eb2876bca56c4175c5689c198ec30284218da072..a4e0870d591a3cab9c636d10ee915f03cdfa0a24 100644 --- a/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc +++ b/chrome/browser/ui/views/frame/layout/browser_view_tabbed_layout_impl.cc -@@ -520,7 +520,7 @@ BrowserViewTabbedLayoutImpl::CalculateProposedLayout( +@@ -561,7 +561,7 @@ BrowserViewTabbedLayoutImpl::CalculateProposedLayout( } BrowserLayoutParams params = browser_params; diff --git a/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch b/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch index 66f01ae01d4..3a52f607422 100644 --- a/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch +++ b/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/multi_contents_view.cc b/chrome/browser/ui/views/frame/multi_contents_view.cc -index aaec9ccc448c92fc1d951e5eccec29134e70aa1d..729960492966b7606b5f5d4644e5611a4b11dae2 100644 +index 6d4c7cd1b3f1e8f0a4f2eae52f0363e323f8a3b0..eb30f037d7c9a7d76584e450db5d9d2996e44469 100644 --- a/chrome/browser/ui/views/frame/multi_contents_view.cc +++ b/chrome/browser/ui/views/frame/multi_contents_view.cc -@@ -78,7 +78,7 @@ MultiContentsView::MultiContentsView( +@@ -81,7 +81,7 @@ MultiContentsView::MultiContentsView( AddChildView(std::make_unique(browser_view)); contents_container_views_.push_back( @@ -11,7 +11,7 @@ index aaec9ccc448c92fc1d951e5eccec29134e70aa1d..729960492966b7606b5f5d4644e5611a contents_container_views_[0] ->contents_view() ->set_is_primary_web_contents_for_window(true); -@@ -87,7 +87,7 @@ MultiContentsView::MultiContentsView( +@@ -90,7 +90,7 @@ MultiContentsView::MultiContentsView( resize_area_->SetVisible(false); contents_container_views_.push_back( diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 75e4d272508..dac7e756144 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 9937db003db4bcb6e69ec0c64c9bee7d71917884..e32bf8be7ee5f234cbfc36485a4010d2fa9b731c 100644 +index be8745c0aacc847f32c40c872c412a43d3e8f5a3..2ca0bafaa90412587dde0ebdbb9da4d56b40ac5c 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -853,6 +853,7 @@ void LocationBarView::Layout(PassKey) { +@@ -860,6 +860,7 @@ void LocationBarView::Layout(PassKey) { .indent_input_when_popup_closed) && !location_icon_view_->ShouldShowLabel() && !ShouldShowKeywordBubble(); @@ -10,7 +10,7 @@ index 9937db003db4bcb6e69ec0c64c9bee7d71917884..e32bf8be7ee5f234cbfc36485a4010d2 if (should_indent) { icon_left += 7 /*icon_indent*/; icon_left += omnibox_feature_configs::AdjustOmniboxIndent() -@@ -941,6 +942,7 @@ void LocationBarView::Layout(PassKey) { +@@ -948,6 +949,7 @@ void LocationBarView::Layout(PassKey) { } selected_keyword_view_->SetCustomImage(image); } @@ -18,7 +18,7 @@ index 9937db003db4bcb6e69ec0c64c9bee7d71917884..e32bf8be7ee5f234cbfc36485a4010d2 } else if (location_icon_view_->GetShowText() && !ShouldChipOverrideLocationIcon()) { location_icon_view_->SetVisible(true); -@@ -1006,6 +1008,7 @@ void LocationBarView::Layout(PassKey) { +@@ -1013,6 +1015,7 @@ void LocationBarView::Layout(PassKey) { (info.num_legacy_page_actions_shown == 0) && !all_page_actions_migrated ? 4 : trailing_decorations_edge_padding; @@ -26,7 +26,7 @@ index 9937db003db4bcb6e69ec0c64c9bee7d71917884..e32bf8be7ee5f234cbfc36485a4010d2 add_trailing_decoration(page_action_icon_container_, /*intra_item_padding=*/0, /*edge_padding=*/ -@@ -1029,6 +1032,7 @@ void LocationBarView::Layout(PassKey) { +@@ -1036,6 +1039,7 @@ void LocationBarView::Layout(PassKey) { add_trailing_decoration(clear_all_button_, /*intra_item_padding=*/0, /*edge_padding=*/trailing_decorations_edge_padding); diff --git a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch index 40321e63138..3cfeb2c6864 100644 --- a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch +++ b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index 94648718cc291dea8d5f4d7eace79c67d92bdd5f..e28b60c593f1a39e34545243a066be2079131d47 100644 +index 69b2fbfbcbabda336021c5b4935f6d6e4cdd1a7e..d2d0271802308e8b362a92d9effac3a2c97bda3f 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -354,7 +354,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( @@ -11,7 +11,7 @@ index 94648718cc291dea8d5f4d7eace79c67d92bdd5f..e28b60c593f1a39e34545243a066be20 overlay_window->SetColorModeOverride(ui::ColorProviderKey::ColorMode::kDark); -@@ -1004,6 +1004,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { +@@ -1010,6 +1010,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { max_size_ = new_max_size; diff --git a/patches/chrome-browser-ui-views-page_action-page_action_controller.h.patch b/patches/chrome-browser-ui-views-page_action-page_action_controller.h.patch index 37e2bfd2893..9099cfc7077 100644 --- a/patches/chrome-browser-ui-views-page_action-page_action_controller.h.patch +++ b/patches/chrome-browser-ui-views-page_action-page_action_controller.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_action/page_action_controller.h b/chrome/browser/ui/views/page_action/page_action_controller.h -index 0cc8990928974cb418729eeba1320a560ade336e..5d4fa08f7f4e52d3f300f7e88d5bc712e60cd4f7 100644 +index f8b60561923541d940cbc6c7fdee6fa0d025584f..04e8d51f72cbd59f23ba1b706fa27565b05e4efd 100644 --- a/chrome/browser/ui/views/page_action/page_action_controller.h +++ b/chrome/browser/ui/views/page_action/page_action_controller.h -@@ -107,6 +107,22 @@ class PageActionController { +@@ -109,6 +109,22 @@ class PageActionController { public: virtual ~PageActionController() = default; @@ -25,7 +25,7 @@ index 0cc8990928974cb418729eeba1320a560ade336e..5d4fa08f7f4e52d3f300f7e88d5bc712 // Requests that the page action be shown or hidden. virtual void Show(actions::ActionId action_id) = 0; virtual void Hide(actions::ActionId action_id) = 0; -@@ -221,6 +237,16 @@ class PageActionControllerImpl : public PageActionController, +@@ -246,6 +262,16 @@ class PageActionControllerImpl : public PageActionController, PageActionControllerImpl& operator=(const PageActionControllerImpl&) = delete; ~PageActionControllerImpl() override; diff --git a/patches/chrome-browser-ui-views-page_action-page_action_properties_provider.cc.patch b/patches/chrome-browser-ui-views-page_action-page_action_properties_provider.cc.patch index d020adbd277..ad311836af1 100644 --- a/patches/chrome-browser-ui-views-page_action-page_action_properties_provider.cc.patch +++ b/patches/chrome-browser-ui-views-page_action-page_action_properties_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_action/page_action_properties_provider.cc b/chrome/browser/ui/views/page_action/page_action_properties_provider.cc -index 3dfce9a2c3b183dc7f8d1c83033826e8349be6fb..06e9fe315bc9b1ce89df44a0a257f25850024716 100644 +index b8a5258c425b0e1f406b505589cfc2c5166d5166..f10222dd8ea0b109e91d831cf5d8ef6bf8415822 100644 --- a/chrome/browser/ui/views/page_action/page_action_properties_provider.cc +++ b/chrome/browser/ui/views/page_action/page_action_properties_provider.cc -@@ -174,6 +174,13 @@ constexpr auto kPageActionProperties = +@@ -190,6 +190,13 @@ constexpr auto kPageActionProperties = .type = PageActionIconType::kAutofillAddress, }, }, diff --git a/patches/chrome-browser-ui-views-page_action-page_action_view.cc.patch b/patches/chrome-browser-ui-views-page_action-page_action_view.cc.patch index 757f2223e70..3a7d9a5aea6 100644 --- a/patches/chrome-browser-ui-views-page_action-page_action_view.cc.patch +++ b/patches/chrome-browser-ui-views-page_action-page_action_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_action/page_action_view.cc b/chrome/browser/ui/views/page_action/page_action_view.cc -index 2bb072cd1e36eb9af181230a3864fc8baaffedd7..ddd696e38708e495ce16499b269c8fc23a62ab35 100644 +index 6471745b5f2aa666d517e14d1c259821755a2a5e..21cd4d8a70cae18eee6b16ca9af9650d0c864d4b 100644 --- a/chrome/browser/ui/views/page_action/page_action_view.cc +++ b/chrome/browser/ui/views/page_action/page_action_view.cc -@@ -120,7 +120,7 @@ void PageActionView::OnPageActionModelChanged( +@@ -135,7 +135,7 @@ void PageActionView::OnPageActionModelChanged( if (!model.GetVisible()) { ResetSlideAnimation(/*show=*/false); NotifyIsChipShowingChange(); diff --git a/patches/chrome-browser-ui-views-page_info-page_info_bubble_view.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_bubble_view.cc.patch index 417978615e6..6a24b257306 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc -index 8d7b683462acaa34abdc6f174c250348dec60a80..2392dc4451e2cbb7299df5af293159495ae0c9c0 100644 +index 22224cc026e35aa04c0cde2471a0191b008086d6..a2d4744197b90d8f2b31b41b3700a0268f9a87b8 100644 --- a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc @@ -209,7 +209,7 @@ views::BubbleDialogDelegateView* PageInfoBubbleView::CreatePageInfoBubble( 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 748a0194027..826806c5738 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 e0667cfefce493511aed00ec6bbc415324035f8f..7b5258e58b4b9cd6fd5b52919e3e6ff8abc9274b 100644 +index c7cd8732718fdae93bf4ce9eeca833f88994c0cd..e8960fd98ce879c15ba2c404f6086031770bb69e 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 -@@ -163,6 +163,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( +@@ -182,6 +182,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 73508316f72..497ca1521bc 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 341cc8bea7ae84d7eb2bebd762cd253652a89c01..474d0d0a6bbae5d5cd92477d0b90eac104861d8c 100644 +index 28caee9dd31c96d3dcca8040e91e5d9bb546972c..9f767a862cce4b248c012b246024f798c6cb8b77 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -169,6 +169,7 @@ class AvatarToolbarButton : public ToolbarButton, +@@ -174,6 +174,7 @@ class AvatarToolbarButton : public ToolbarButton, #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) private: 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 24a890581aa..939aa4c6b75 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,5 +1,5 @@ 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 87f628125449dd8a9f0aa833fb9499426f1740d1..9e99a6efaa9c53f4146818f43a64845dce36e406 100644 +index 982a679e9e4ee867c8c6293b27c70d8e988a783e..f33009f5d2d123724b22d3fd369ab1afd5c778fe 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h @@ -36,7 +36,7 @@ class View; diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index dd82e1537ed..053f46a8aff 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index e06a60bba0f89ed1a1c5897f3ec2cff37b81ff55..c00ab548d538422091f9fd4b8135d392b284f174 100644 +index 5eb82642318a922e9faefb1d696c597aa5c062c4..babfc7af6aeb6c0fb2434da40474dbda7aa1fdbf 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -391,6 +391,7 @@ void Tab::Layout(PassKey) { +@@ -402,6 +402,7 @@ void Tab::Layout(PassKey) { // indicator, but visually it will be smaller at kFaviconSize wide. gfx::Rect favicon_bounds(start, contents_rect.y(), 0, 0); if (showing_icon_) { @@ -10,7 +10,7 @@ index e06a60bba0f89ed1a1c5897f3ec2cff37b81ff55..c00ab548d538422091f9fd4b8135d392 if (center_icon_) { // When centering the favicon, the favicon is allowed to escape the normal // contents rect. -@@ -488,6 +489,7 @@ void Tab::Layout(PassKey) { +@@ -499,6 +500,7 @@ void Tab::Layout(PassKey) { int title_right = contents_rect.right(); if (showing_alert_indicator_) { title_right = alert_indicator_button_->x() - after_title_padding; @@ -18,7 +18,7 @@ index e06a60bba0f89ed1a1c5897f3ec2cff37b81ff55..c00ab548d538422091f9fd4b8135d392 } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -634,7 +636,7 @@ void Tab::OnMouseReleased(const ui::MouseEvent& event) { +@@ -646,7 +648,7 @@ void Tab::OnMouseReleased(const ui::MouseEvent& event) { // Close tab on middle click, but only if the button is released over the tab // (normal windows behavior is to discard presses of a UI element where the // releases happen off the element). diff --git a/patches/chrome-browser-ui-views-tabs-tab.h.patch b/patches/chrome-browser-ui-views-tabs-tab.h.patch index 6457f0dabf5..6ee66d7084e 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.h.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h -index 4aebda48a37fc766beeaa2b4cc2dbde1cb5560a0..28cc108bfd4fb02f77ce022ce3b23c0c353a8edd 100644 +index 6cd517dd3706c663a2092e9dc0de0e5229b320a9..2651092d68a43f7476e0c8bf4bbacc60b4429159 100644 --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h -@@ -307,7 +307,7 @@ class Tab : public gfx::AnimationDelegate, +@@ -301,7 +301,7 @@ class Tab : public gfx::AnimationDelegate, // Whether we are showing the close button. It is cached so that we can // detect when it changes and layout appropriately. diff --git a/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch index 1cf9cdd2a49..002454f028f 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_group_views.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_group_views.cc b/chrome/browser/ui/views/tabs/tab_group_views.cc -index b8d28909577c4ecdd6b45dfec4a6892757f9bfea..5d4ad920c83505ced64a56f8d2ead2aa37380418 100644 +index 39d323aefcda20408523320a7585ccec799bb96e..13a38e5514e299f0c462f18dca5ab6a7873812d9 100644 --- a/chrome/browser/ui/views/tabs/tab_group_views.cc +++ b/chrome/browser/ui/views/tabs/tab_group_views.cc @@ -168,6 +168,7 @@ TabGroupViews::GetLeadingTrailingGroupViews( diff --git a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch index a0e76120f01..a0e74c02323 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -index a2d2cda4540c5bb898231d97241bfe47ad04baa5..191442aae1cef8ae659e197f3babc5fccaa9627c 100644 +index fabec4410e7c7fe26379bbfbecdc4e5080f56147..685852d37fc5d43b053bf3b9c366c725a838f137 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h +++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -@@ -100,6 +100,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { +@@ -104,6 +104,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { // available, or `std::nullopt` to disable crossfades entirely. static std::optional GetPreviewImageCrossfadeStart(); 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 459b1070242..483ad55e678 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index be0b9d0b9d08a63f6a28c33457f6d0bdc9d6eddf..93c33a79d36331045d0492687ec3067750ace312 100644 +index 8964767230cca9fb96abdc67893fbe803e0f09ea..e527496900849722145fc119dbf0e810977288aa 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -342,7 +342,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -350,7 +350,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, event.type() == ui::EventType::kGestureScrollBegin)) << "Event type must be suitable for starting a drag."; @@ -11,7 +11,7 @@ index be0b9d0b9d08a63f6a28c33457f6d0bdc9d6eddf..93c33a79d36331045d0492687ec30677 // !!! Init may delete `drag_controller_` on some platforms. !!! // Init takes capture, which on some platforms may reenter Chrome, the -@@ -577,6 +577,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -591,6 +591,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, std::vector CalculateBoundsForDraggedViews( const std::vector& views) override { @@ -19,7 +19,7 @@ index be0b9d0b9d08a63f6a28c33457f6d0bdc9d6eddf..93c33a79d36331045d0492687ec30677 CHECK(!views.empty()) << "The views vector must not be empty."; std::vector bounds; -@@ -934,6 +935,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -940,6 +941,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, continue; } @@ -27,7 +27,7 @@ index be0b9d0b9d08a63f6a28c33457f6d0bdc9d6eddf..93c33a79d36331045d0492687ec30677 // If there's a group header here, and we're dragging a group, we might // end up on either side of that header. Check both cases to find the // best option. -@@ -1504,7 +1506,7 @@ void TabStrip::SetSelection(const ui::ListSelectionModel& new_selection) { +@@ -1510,7 +1512,7 @@ void TabStrip::SetSelection(const ui::ListSelectionModel& new_selection) { const tab_groups::TabGroupId new_group = selected_tab->group().value(); // If the tab that is about to be selected is in a collapsed group, // automatically expand the group. diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch index 18dd1f24718..b992b998f47 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc -index 5bf425a33e86505518beb2c8dd17587965fc616a..2fc5cbeaacafd30bc68d591b879ae50adfeb0a56 100644 +index 06cb552168bd568a1702107e512f127ea217d553..891396cfe221b541ee96f24534da8f0e5a19d931 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc @@ -123,6 +123,7 @@ class TabStyleViewsImpl : public TabStyleViews { @@ -18,7 +18,7 @@ index 5bf425a33e86505518beb2c8dd17587965fc616a..2fc5cbeaacafd30bc68d591b879ae50a bool IsHovering() const; // Returns whether the hover animation is being shown. -@@ -361,6 +363,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type, +@@ -364,6 +366,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type, extension_corner_radius -= 0.5f * stroke_adjustment; } const bool compact_left_to_bottom = ShouldCompactLeadingEdge(path_type); @@ -26,7 +26,7 @@ index 5bf425a33e86505518beb2c8dd17587965fc616a..2fc5cbeaacafd30bc68d591b879ae50a float left_extension_corner_radius = extension_corner_radius; if (compact_left_to_bottom) { -@@ -1031,14 +1034,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const { +@@ -1041,14 +1044,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const { SK_AlphaOPAQUE)); }; diff --git a/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch b/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch index 872559e26f1..f4f6dc2468a 100644 --- a/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc b/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc -index 03179be5b1ebeb6f1261c9705573553b16b7ee1f..df5e36ab776a9b96e9ac28c1956abdf776fcd85d 100644 +index 3f6e58c37d76c2e8fbe9948d9274cbbad1d6c0b7..fbcf378f36b435a17d4ef46ae270858b622a09f9 100644 --- a/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc +++ b/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc @@ -37,6 +37,7 @@ TabCollectionNode::Type GetTypeFromNode(tabs::ConstChildPtr node_data_) { diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 92bef2d52ff..c2e621b363f 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 7e2880e8f281f35b4fdfda7b403ee3d2d65d34db..03ed856b3b88d3d240544c4eb774d75b4e8c9efa 100644 +index c16935b0a78658639a9ad86af10614172bfbb7da..3b926c3969edeb52575df062293e7bdf436836a9 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -573,6 +573,7 @@ void ToolbarView::Init() { +@@ -597,6 +597,7 @@ void ToolbarView::Init() { media_button_ = AddChildView(std::move(media_button)); } diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view_unittest.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view_unittest.cc.patch index b0dbb22e3a4..8ee91e08d4c 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view_unittest.cc.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view_unittest.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc -index bd816a3f09a3391b89f8be234a22d2d878aad6ab..ae0078ace1901a7211f963d09e22e354b1ca7fbc 100644 +index e5efc13441a82fe8110df484798e06ec7c19936a..1d393dc18577e05178d1bb66aea289ee03ccbd42 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc @@ -174,6 +174,7 @@ class TranslateBubbleViewTest : public ChromeViewsTestBase { diff --git a/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch b/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch index cafd2e5c6ed..d682cef6ac6 100644 --- a/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch +++ b/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/user_education/browser_user_education_service.cc b/chrome/browser/ui/views/user_education/browser_user_education_service.cc -index 69dfb70378671bbd7f1153c177d375b42af0d892..9c84fccf9f7339fca013e008977dab6758ee2bc2 100644 +index 11fc46efc958b8d589e9f07dab9d1d7819facdb9..dcca75c70a125eca531e4e0716ca7d4f1aad75c1 100644 --- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc +++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -269,6 +269,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -325,6 +325,7 @@ void MaybeRegisterChromeFeaturePromos( feature_engagement::kIPHWebUiHelpBubbleTestFeature)) { return; } diff --git a/patches/chrome-browser-ui-webui-BUILD.gn.patch b/patches/chrome-browser-ui-webui-BUILD.gn.patch index a46eb324690..0e39c6c326a 100644 --- a/patches/chrome-browser-ui-webui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-webui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn -index cc84beb728fbac36fd63613378508bc9a778b59a..e9319e53f4ba436bd9e7d9d660154f19ad6ffa3e 100644 +index d8294ffa72da32a99a06214271dd1352619cdf2b..f14458392441e82067d543e670a8cf1bb32457cc 100644 --- a/chrome/browser/ui/webui/BUILD.gn +++ b/chrome/browser/ui/webui/BUILD.gn @@ -146,6 +146,7 @@ source_set("configs") { 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 6bca678e676..390b393553f 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 b2aa6f2e332205f520045a0253bb57338ab64ef8..292ee64939c7b7f2fc9bfec529385c5f566cc974 100644 +index 64348336c6b24fb0ed59d6290690a2704248b993..3898354e5bc8be7678f00314bd6844c7db3772bd 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -339,6 +339,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -330,6 +330,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch b/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch index 68187d17b15..8907c3f77e5 100644 --- a/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc -index c99a747c3fc33c3ee8261040b285e6a1e701fa5f..54bad0b3972d93c16c8299f65d79a9b5a35f7c13 100644 +index ea9f7d6be1fc3e5ddad9e37d8a8d85bdf2d58a4e..38e26b8b513fed9a6d010da8dcd0e0f0077127ef 100644 --- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc +++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc -@@ -624,6 +624,7 @@ std::string SearchboxHandler::AutocompleteIconToResourceName( +@@ -626,6 +626,7 @@ std::string SearchboxHandler::AutocompleteIconToResourceName( // TODO(446953331): It's error-prone to keep the above if's up to date. When // omnibox input and popup views are replaced with webUI, matches and // actions can store an icon enum instead of `VectorIcon`. 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 d5f27abe48d..38c0f4ef344 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 f482bb58c258f82030f5c288100e554da1f20a8a..631323afef87a3658a905edec61dcef0a24af9b3 100644 +index a68192c5921ce04c934da07a8364b000a0bdf38d..a9111873ff39562b29c61dbffdc365f099471ff7 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -513,6 +513,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -515,6 +515,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME))); #endif // BUILDFLAG(IS_CHROMEOS) 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 c45d0eb3615..5662ac19d33 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,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index a2e370ba3b71a18a77a1654c2178827ec4da5c68..3afd94b42ebc753dd44436f77c01846ce6b95706 100644 +index a37a4d23d7bee7b46f24c1bdb9d7072b1fb2820f..98fdb84587ccfdb279351e9597793b0f0f207847 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -258,6 +258,7 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array< diff --git a/patches/chrome-browser-ui-webui-theme_source.cc.patch b/patches/chrome-browser-ui-webui-theme_source.cc.patch index 779defb6113..f619bb5f716 100644 --- a/patches/chrome-browser-ui-webui-theme_source.cc.patch +++ b/patches/chrome-browser-ui-webui-theme_source.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc -index 74512212a61d332099816a0e3db6fb900dd430c6..816f79086b2557e657f7be1bc6e0e56d77b1edb5 100644 +index 585833c193b2030bc3e137ce03da4d2f4092b296..855a164db0526e9e97e45cdf7888a1b0edf53590 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc -@@ -354,6 +354,7 @@ void ThemeSource::SendColorsCss( +@@ -353,6 +353,7 @@ void ThemeSource::SendColorsCss( const auto* theme_service = ThemeServiceFactory::GetForProfile(profile_->GetOriginalProfile()); diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 21c2a1cc1b0..0888b3d1e97 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index c64007c87236e1813a2223a5f23a075a08be01a4..6b3aed3070b77aa8c306497f49f5e542c8fed394 100644 +index e6ec5782e66340524576cbb0d09768dc296ce994..003abc6e6a0bab89a816b423ecc29f4a9b474054 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -92,6 +92,7 @@ source_set("channel_info") { +@@ -91,6 +91,7 @@ source_set("channel_info") { } else if (is_posix) { sources += [ "channel_info_posix.cc" ] } @@ -10,7 +10,7 @@ index c64007c87236e1813a2223a5f23a075a08be01a4..6b3aed3070b77aa8c306497f49f5e542 } source_set("ini_parser") { -@@ -281,6 +282,7 @@ static_library("common_lib") { +@@ -280,6 +281,7 @@ static_library("common_lib") { public_deps += [ "//components/cdm/common" ] } @@ -18,7 +18,7 @@ index c64007c87236e1813a2223a5f23a075a08be01a4..6b3aed3070b77aa8c306497f49f5e542 if (enable_extensions_core) { public_deps += [ "//chrome/common/extensions", -@@ -473,6 +475,7 @@ static_library("non_code_constants") { +@@ -472,6 +474,7 @@ static_library("non_code_constants") { if (is_win) { sources += [ "chrome_icon_resources_win.h" ] } @@ -26,7 +26,7 @@ index c64007c87236e1813a2223a5f23a075a08be01a4..6b3aed3070b77aa8c306497f49f5e542 } component("chrome_features") { -@@ -578,6 +581,7 @@ static_library("constants") { +@@ -577,6 +580,7 @@ static_library("constants") { "//third_party/widevine/cdm:buildflags", ] diff --git a/patches/chrome-common-extensions-BUILD.gn.patch b/patches/chrome-common-extensions-BUILD.gn.patch index 04b32e32b7a..579bd1db49b 100644 --- a/patches/chrome-common-extensions-BUILD.gn.patch +++ b/patches/chrome-common-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/extensions/BUILD.gn b/chrome/common/extensions/BUILD.gn -index 07f9e298b4ac190c9461a925c1839bd46d988a9e..c6995f28cba8e8544b1eff4536a53a74f24cafff 100644 +index 097d660d1d9ee0c4df2bad419ee0dbb4097c787a..2ee61f0b93a50fa82c4a52f00f67223ef6b3c457 100644 --- a/chrome/common/extensions/BUILD.gn +++ b/chrome/common/extensions/BUILD.gn -@@ -117,6 +117,7 @@ source_set("extensions") { +@@ -116,6 +116,7 @@ source_set("extensions") { sources += [ "api/file_system_provider_capabilities/file_system_provider_capabilities_handler.cc" ] } diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index f899cc2c22c..fb73b62bed8 100644 --- a/patches/chrome-common-extensions-api-developer_private.idl.patch +++ b/patches/chrome-common-extensions-api-developer_private.idl.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl -index de49ac2ac204bcd882067a8944759a1199d7ab82..c2938670f7ed7159cff350b7388a08e419f126e5 100644 +index 29ebd9733a2e7d2dcbe42abae3270e3ba59b4a12..db929dc26c98a182f4c43e4f134867755286b10a 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl @@ -229,6 +229,7 @@ namespace developerPrivate { diff --git a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch index 1ada7ccdeb6..64bbf5a3de4 100644 --- a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch +++ b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc -index f2dc6bbfb60af6e0f1765fc7ceca1b62d02de6dd..81021669faa2aee118c63aa53c5ed3472438dcbd 100644 +index d4f5d2c268b420b9229afb07e375e44f042b3261..be4e9fbe3028ddda89f87278ab1b4e143d525958 100644 --- a/chrome/common/extensions/chrome_extensions_client.cc +++ b/chrome/common/extensions/chrome_extensions_client.cc @@ -14,6 +14,7 @@ @@ -10,7 +10,7 @@ index f2dc6bbfb60af6e0f1765fc7ceca1b62d02de6dd..81021669faa2aee118c63aa53c5ed347 #include "chrome/common/chrome_resource_request_blocked_reason.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/chrome_extensions_api_provider.h" -@@ -55,6 +56,7 @@ const char kExtensionBlocklistHttpsUrlPrefix[] = +@@ -56,6 +57,7 @@ const char kExtensionBlocklistHttpsUrlPrefix[] = ChromeExtensionsClient::ChromeExtensionsClient() { AddAPIProvider(std::make_unique()); AddAPIProvider(std::make_unique()); diff --git a/patches/chrome-elevation_service-BUILD.gn.patch b/patches/chrome-elevation_service-BUILD.gn.patch index ead6d1ed0f1..53b2d082a8a 100644 --- a/patches/chrome-elevation_service-BUILD.gn.patch +++ b/patches/chrome-elevation_service-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/elevation_service/BUILD.gn b/chrome/elevation_service/BUILD.gn -index faef0f8cba55bf5b05e338e21df41b92e58bfb13..d6886c0f464987aeae2a36e2ad919a51fe79ad80 100644 +index 2995e0c3c0b6d25837337532ca33d3f29d9feac4..fcc46393986f948f38f5dc446de742f31f82e1ab 100644 --- a/chrome/elevation_service/BUILD.gn +++ b/chrome/elevation_service/BUILD.gn @@ -11,6 +11,7 @@ import("//testing/test.gni") @@ -10,7 +10,7 @@ index faef0f8cba55bf5b05e338e21df41b92e58bfb13..d6886c0f464987aeae2a36e2ad919a51 writes_tlb = true } -@@ -79,6 +80,7 @@ source_set("lib") { +@@ -82,6 +83,7 @@ source_set("lib") { "crypt32.lib", "rpcrt4.lib", ] diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index 45ce1defa2b..9322038d8d9 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f038108fcfb 100644 +index 20ab87def9800142b19818ae4e5d478610fc8ea0..cbcf2fa02b61b268b07b2f2b3e23bef197a40c54 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn -@@ -16,6 +16,7 @@ import("//third_party/angle/gni/angle.gni") +@@ -18,6 +18,7 @@ import("//third_party/angle/gni/angle.gni") import("//third_party/widevine/cdm/widevine.gni") import("//ui/gl/features.gni") import("//ui/qt/qt.gni") @@ -10,7 +10,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 if (bundle_widevine_cdm) { import("//media/cdm/library_cdm/cdm_paths.gni") -@@ -63,6 +64,7 @@ if (build_with_internal_optimization_guide) { +@@ -65,6 +66,7 @@ if (build_with_internal_optimization_guide) { [ "$root_out_dir/liboptimization_guide_internal.so" ] } @@ -18,7 +18,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 packaging_files_binaries = packaging_files_executables + packaging_files_shlibs # TODO(mmoss) Any convenient way to get all the relevant build files? -@@ -172,6 +174,7 @@ action("merge_rpm_dependencies") { +@@ -174,6 +176,7 @@ action("merge_rpm_dependencies") { strip_binary("strip_chrome_binary") { binary_input = "$root_out_dir/chrome" deps = [ "//chrome" ] @@ -26,7 +26,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 } strip_binary("strip_chrome_crashpad_handler") { -@@ -187,6 +190,7 @@ strip_binary("strip_chrome_management_service") { +@@ -189,6 +192,7 @@ strip_binary("strip_chrome_management_service") { strip_binary("strip_chrome_sandbox") { binary_input = "$root_out_dir/chrome_sandbox" deps = [ "//sandbox/linux:chrome_sandbox" ] @@ -34,7 +34,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 } strip_binary("strip_libEGL_shlib") { -@@ -276,6 +280,7 @@ copy("common_packaging_files") { +@@ -323,6 +327,7 @@ copy("common_packaging_files") { } outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ] @@ -42,7 +42,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 } copy("deb_packaging_files") { -@@ -373,6 +378,7 @@ group("installer_deps") { +@@ -423,6 +428,7 @@ group("installer_deps") { "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component", "//sandbox/linux:chrome_sandbox", ] @@ -50,7 +50,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 if (bundle_widevine_cdm) { public_deps += [ "//third_party/widevine/cdm" ] } -@@ -427,11 +433,14 @@ group("installer_deps") { +@@ -477,11 +483,14 @@ group("installer_deps") { template("linux_package") { assert(defined(invoker.channel)) channel = invoker.channel @@ -66,7 +66,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 } deb_target_name = "${target_name}_deb" -@@ -460,7 +469,7 @@ template("linux_package") { +@@ -510,7 +519,7 @@ template("linux_package") { } inputs = packaging_files @@ -75,7 +75,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 args = [ "-a", -@@ -514,7 +523,7 @@ template("linux_package") { +@@ -566,7 +575,7 @@ template("linux_package") { } inputs = packaging_files @@ -84,7 +84,7 @@ index 291ef25d7e29b9dede8f8c84a47d94e364910c74..a4d9cd241fcf47555f727a467f5e1f03 args = [ "-a", -@@ -561,3 +570,6 @@ linux_package("unstable") { +@@ -613,3 +622,6 @@ linux_package("unstable") { linux_package("canary") { channel = "canary" } diff --git a/patches/chrome-installer-linux-debian-build.py.patch b/patches/chrome-installer-linux-debian-build.py.patch index 8ad286bde48..85409d1212e 100644 --- a/patches/chrome-installer-linux-debian-build.py.patch +++ b/patches/chrome-installer-linux-debian-build.py.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/linux/debian/build.py b/chrome/installer/linux/debian/build.py -index 4c8c99046294dbcdb7bac607af383202faf1b22e..36ad3e6c09ebdd5480287042e634740b639c2169 100755 +index 2d023ed81b760dde4efa72b1a7a58ce536a6aa78..27cc9692240c71d8f202607695e80629bf4b709a 100755 --- a/chrome/installer/linux/debian/build.py +++ b/chrome/installer/linux/debian/build.py -@@ -161,6 +161,8 @@ def main() -> None: +@@ -168,6 +168,8 @@ def main() -> None: logging.info(f"Packaging {args.arch}...") config.deb_pre_depends = config.common_predeps config.deb_depends = config.common_deps @@ -11,7 +11,7 @@ index 4c8c99046294dbcdb7bac607af383202faf1b22e..36ad3e6c09ebdd5480287042e634740b config.deb_provides = "www-browser" installer.gen_changelog(config, deb_changelog) -@@ -172,6 +174,8 @@ def main() -> None: +@@ -179,6 +181,8 @@ def main() -> None: os.environ["DEB_HOST_ARCH"] = args.arch pkg_name = f"{config.package_orig}-{config.channel}" diff --git a/patches/chrome-installer-linux-debian-postinst.patch b/patches/chrome-installer-linux-debian-postinst.patch index 6258ba58e66..0cc8bc61e90 100644 --- a/patches/chrome-installer-linux-debian-postinst.patch +++ b/patches/chrome-installer-linux-debian-postinst.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/debian/postinst b/chrome/installer/linux/debian/postinst -index f767a80e0046a66dd1b1d467933da2ec6616e3ab..a179eb086f5c66e12ad2a21b03a00f0427534c88 100755 +index 0613a69af29b01822254170fb0e42178c45bda12..7483b20bd469ad1f85086c8b182dba9337d607ab 100755 --- a/chrome/installer/linux/debian/postinst +++ b/chrome/installer/linux/debian/postinst @@ -45,6 +45,7 @@ case $CHANNEL in diff --git a/patches/chrome-installer-setup-BUILD.gn.patch b/patches/chrome-installer-setup-BUILD.gn.patch index 559628353ff..7094fbb4edb 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 aea260e71822d4d4e99a82350759329726bcabfe..9ddc05abbc925b835b9d8e17bd519fd530fb0567 100644 +index 438a99474b959cbf2f23abe7a5932af28217217b..b8adbaa30e396baaaf5d8f2883dd5b45f0e2e82d 100644 --- a/chrome/installer/setup/BUILD.gn +++ b/chrome/installer/setup/BUILD.gn -@@ -133,6 +133,7 @@ if (is_win) { +@@ -135,6 +135,7 @@ if (is_win) { "channel_override_work_item.h", ] } diff --git a/patches/chrome-installer-setup-install_worker.cc.patch b/patches/chrome-installer-setup-install_worker.cc.patch index 686ac475c89..22d7bd8c2ce 100644 --- a/patches/chrome-installer-setup-install_worker.cc.patch +++ b/patches/chrome-installer-setup-install_worker.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc -index 315760e9c64bb2767ce01ef2c7d8aa9a0d7f7c82..ada206aade3c8e8f3c1450f159a600490e4957e9 100644 +index feeca02961ebdec4f66112ab7cf530c3a539858f..e8f67a8586474ba01a46e03c37d2b5b7b396bee4 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -107,6 +107,7 @@ void AddInstallerCopyTasks(const InstallParams& install_params, diff --git a/patches/chrome-installer-setup-setup_main.cc.patch b/patches/chrome-installer-setup-setup_main.cc.patch index 5251a7740c2..78637dc767e 100644 --- a/patches/chrome-installer-setup-setup_main.cc.patch +++ b/patches/chrome-installer-setup-setup_main.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc -index 7ca7d00b209839cfc502c6b4ce7fc3285ff100e9..2a3bc1bfbd686f3ed2c889e80e638266e1c5812e 100644 +index 8248498ff67c6c64817a2bf09fd1be7f7b8a0b36..2c7fd7a2f2cd30e52fe7f364f158b69d5e807973 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc -@@ -706,6 +706,7 @@ installer::InstallStatus InstallProducts(InstallationState& original_state, +@@ -716,6 +716,7 @@ installer::InstallStatus InstallProducts(InstallationState& original_state, } } @@ -10,7 +10,7 @@ index 7ca7d00b209839cfc502c6b4ce7fc3285ff100e9..2a3bc1bfbd686f3ed2c889e80e638266 return install_status; } -@@ -1533,6 +1534,7 @@ int SetupMain() { +@@ -1543,6 +1544,7 @@ int SetupMain() { &exit_code)) { return exit_code; } diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch index a148a23bf54..99e8fab324a 100644 --- a/patches/chrome-installer-util-BUILD.gn.patch +++ b/patches/chrome-installer-util-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn -index 7c88a60f19ee782f139bebed13e926789e943df0..5a4ad54d02cd7ad862e4a2c1cab6b8b120f3ed75 100644 +index b0670229bfb5ee90e4ed1554b1d74be3998428ff..1bb41b1701af2d5c78a55c30aef46f5e089c0678 100644 --- a/chrome/installer/util/BUILD.gn +++ b/chrome/installer/util/BUILD.gn -@@ -202,6 +202,7 @@ static_library("with_no_strings") { +@@ -204,6 +204,7 @@ static_library("with_no_strings") { "initial_preferences.h", ] } @@ -10,7 +10,7 @@ index 7c88a60f19ee782f139bebed13e926789e943df0..5a4ad54d02cd7ad862e4a2c1cab6b8b1 } # Use this version of installer_util to link to the generated strings in .rc -@@ -234,6 +235,7 @@ generate_embedded_i18n("generate_strings") { +@@ -236,6 +237,7 @@ generate_embedded_i18n("generate_strings") { output_file_name_base = "installer_util_strings" branding = branding_path_product diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index eb6dd4ace7a..5dde50824d0 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index ccc22d2c563306b13bf2c0aef62f2c22f8ec0bc1..f4af7b9709771242ad7f19514915b6d2d78c4055 100644 +index 70577180b6c1d2a819bab63f8bbd0a09847a4b9e..80af1c68998bafbe0312deaad9519087154b886f 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -243,6 +243,7 @@ static_library("renderer") { diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index f156158fb4d..09c3d676a97 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 a9d53bb566fab5b45c867e3fe90228a7ff4d09bb..03107916fec27bcd221e6d4830b65e0607269ccb 100644 +index dcc6684123c561d06540ffdd4bea285b64f8feea..7faa364eabad1cea06546f60269432c7d020ff8b 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -604,7 +604,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -610,7 +610,7 @@ void ChromeContentRendererClient::RenderFrameCreated( extensions::ExtensionsRendererClient::Get()->dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index f0b89c9d006..4c3cc6b56d8 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 cfc35bf65e3dd4b4025202a75ab40c021ff22bc2..92b81b53d88713806fa0ad1f0c3362a2b35240c2 100644 +index cc33615f8ee24c92c26c1b64ba362d9868ec91e4..1d163f925377350f77470b610c7428dcb13ee8c7 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h -@@ -235,6 +235,7 @@ class ChromeContentRendererClient +@@ -236,6 +236,7 @@ class ChromeContentRendererClient #endif private: diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 7ad14367b5c..d68a5307c28 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 fb5537a69c76894e70e04f62a58ad003c993f89c..e5ec1ad537f01fb852efc98eaa5948f8f3f1f718 100644 +index 209b0e2777e69ed9e56848c3919041e189045979..dc9d77eeacc13384f53559786e0206e820a98d19 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -696,6 +696,7 @@ static_library("test_support") { +@@ -722,6 +722,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 68d7ff3718e..c843cf2b4ab 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 c29225f39a37703ae8662a6c6431d88f72c63b6b..3f53fd3c097e20cb478ad8f2ba392ec2ec1fdf5c 100644 +index 1ed5afcd88ba9cf04d43f6ccc7a1a703f8e462f1..9ea2761c74a4944a48d9926d8736ab91fb82f949 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -285,6 +285,7 @@ build_webui_tests("build") { +@@ -284,6 +284,7 @@ build_webui_tests("build") { ts_definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index b14f604560b..0d586651e07 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 3161e65568aa2364625362654a0aa204ec811621..ced8b1a17bf77fc5e31cff063fefb18e1abbd6d6 100644 +index 09a55515091dcf8acdb23023aad8d6eb8d16de3c..1395ad873df1b6af651bed8d4564a8e46f8f975b 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -254,6 +254,7 @@ 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 3e280c9055a..a69e6523650 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 9093d7063c5e38a7997a105d2ba35f162538a72c..ab4497700fb2fd23ce9b805008f1d8212cf51a54 100644 +index 76960d3fe1f6ed90c95b34411366e583b437a2cd..6c9dbe3f4684dde6029a769053bbed493a5382a7 100644 --- a/components/browser_ui/settings/android/BUILD.gn +++ b/components/browser_ui/settings/android/BUILD.gn -@@ -61,6 +61,7 @@ android_library("java") { +@@ -63,6 +63,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-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index ca2d8f3298a..fd7e28806af 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 c158cb6b3d075f100d69fa4e72d957aa61613b35..7b62e58e9cf128cfc7f8a4d6310a1394dd6789b4 100644 +index d640b69afaff7f3e49610e1350019d3802fe42e4..26c35b57b87ddebea17cdfaae40f9fe527f504e2 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 -@@ -641,7 +641,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -601,7 +601,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); return true; } 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 5b65b89760d..f9d34b33d11 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 a2825980de53cfb0b8ab01f270604b949662e77e..e3d18a67f6fd4b88bdb58a2b0a6e60b021e35b4b 100644 +index 3639563a7bf6fe742cb4105c7e6a8d770cbcc28d..cb24e4c0b03c5671c24d422da8db719d71c40ff6 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -92,7 +92,7 @@ found in the LICENSE file. diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index 75d6f5304fe..1ff4554dae9 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index e1ca435d57d1978373d17cd2d16f621840fd212b..7e33d6720f769e04fb57399b3c34f04a22577369 100644 +index 809479d01386a444502475f2ea6552e0fadf9f81..5f839e689070255f92348cfdf32bbb43b597406e 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -874,6 +874,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -876,6 +876,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index e1ca435d57d1978373d17cd2d16f621840fd212b..7e33d6720f769e04fb57399b3c34f04a content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION || content_type == ContentSettingsType::GEOLOCATION_WITH_OPTIONS || -@@ -904,6 +905,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -906,6 +907,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::MEDIASTREAM_CAMERA && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-content_settings-core-browser-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch index 44e7cae7ede..2a72a55828b 100644 --- a/patches/components-content_settings-core-browser-BUILD.gn.patch +++ b/patches/components-content_settings-core-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn -index 32fdf21142bdba3d19e198fe258a87bcc74e22c0..fb31f4a39e4ebbda7f62e9134a4090f9629c5eaa 100644 +index a70633920f4475ae7adb3be39076688ec19d9178..f6a4a65a7a69a66eb8cd5c294a4cefc44cd94f6d 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn -@@ -87,6 +87,7 @@ static_library("browser") { +@@ -91,6 +91,7 @@ static_library("browser") { # for PageInfoRelatedWebsiteSetsTest tests. # TODO(crbug.com/40145057): remove deprecated RWS and this include. public_deps += [ "//components/privacy_sandbox:privacy_sandbox_prefs" ] 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 de3863c64db..4979ffe021b 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,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc -index 8e49b6e5977c7f5477e831cedf4b650fdb1c73a7..40a40dd0085baa7648693ca115b5acc257e46e9f 100644 +index 5d4035d703dedd59b6de40a4b6b5c356aae37edb..bd36a2306b6853c71db9ee53d2c8b3abfc555b6d 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc -@@ -193,6 +193,7 @@ void ContentSettingsPref::SetWebsiteSetting( +@@ -194,6 +194,7 @@ void ContentSettingsPref::SetWebsiteSetting( DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(prefs_); DCHECK(primary_pattern != ContentSettingsPattern::Wildcard() || 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 34ff71ae726..508ec9169f2 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,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 164baa1e1de0d7ae61326cdfc85530c23e9eb537..7dff7fa1fdc3e7c7776ebfa82bc527813fe3a056 100644 +index 8adb55497b97130a4533f472af1cb8f097f6555e..80140533fef955dc71d59b5cfad64da7a4093580 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc @@ -119,6 +119,7 @@ void ContentSettingsRegistry::Init() { @@ -10,7 +10,7 @@ index 164baa1e1de0d7ae61326cdfc85530c23e9eb537..7dff7fa1fdc3e7c7776ebfa82bc52781 #if BUILDFLAG(USE_BLINK) | WebsiteSettingsRegistry::PLATFORM_IOS #endif -@@ -841,6 +842,7 @@ void ContentSettingsRegistry::Init() { +@@ -842,6 +843,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::PLATFORM_CHROMEOS, ContentSettingsInfo::INHERIT_IN_INCOGNITO, PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); diff --git a/patches/components-external_intents-android-BUILD.gn.patch b/patches/components-external_intents-android-BUILD.gn.patch index 92da6aad4ed..a263d95a5dd 100644 --- a/patches/components-external_intents-android-BUILD.gn.patch +++ b/patches/components-external_intents-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/external_intents/android/BUILD.gn b/components/external_intents/android/BUILD.gn -index 52678f4b2c2351307e19d47e1daf17ee2f81ad62..774eec05bfb0e7f448b621ae00534699f2118014 100644 +index 44ce7da446d9667eac8d0fa0c3a4fc4abf9ab398..1825bbf2187a3fb3d989926ba5fac4a2bb10e23f 100644 --- a/components/external_intents/android/BUILD.gn +++ b/components/external_intents/android/BUILD.gn -@@ -69,6 +69,7 @@ static_library("android") { +@@ -70,6 +70,7 @@ static_library("android") { "//components/navigation_interception", "//content/public/browser", ] diff --git a/patches/components-feature_engagement-public-feature_list.h.patch b/patches/components-feature_engagement-public-feature_list.h.patch index dc92f3d3449..a1647ee5fdc 100644 --- a/patches/components-feature_engagement-public-feature_list.h.patch +++ b/patches/components-feature_engagement-public-feature_list.h.patch @@ -1,8 +1,8 @@ diff --git a/components/feature_engagement/public/feature_list.h b/components/feature_engagement/public/feature_list.h -index 32f4722e71bb4180bced1544d7f387c046187a69..682067af9e9d28b21261bdc46e182f0e6bdb7f17 100644 +index 52849ba8f9a612f1233871b1a3061841bf171e66..c16edf0968d3a29ec2405c7bf15dd4b4b289470b 100644 --- a/components/feature_engagement/public/feature_list.h +++ b/components/feature_engagement/public/feature_list.h -@@ -564,6 +564,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSTabGroupsDesktopFeature, +@@ -573,6 +573,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSTabGroupsDesktopFeature, DEFINE_VARIATION_PARAM(kIPHiOSPriceTrackingDesktopFeature, "IPH_iOSPriceTrackingDesktop"); #endif // !BUILDFLAG(IS_ANDROID) @@ -10,7 +10,7 @@ index 32f4722e71bb4180bced1544d7f387c046187a69..682067af9e9d28b21261bdc46e182f0e #if !BUILDFLAG(IS_IOS) DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); -@@ -574,6 +575,7 @@ DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); +@@ -583,6 +584,7 @@ DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); // are possible to enable on their own in demo mode. inline constexpr flags_ui::FeatureEntry::FeatureVariation kIPHDemoModeChoiceVariations[] = { diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 9feb5ac292a..dfe33a383a0 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,8 +1,8 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 1b5becf6063bb0afdc094303c84d9561f93e61e5..d8c888ea9914e70171f32538873811edb0e2201f 100644 +index b8ef1a5a8200d422e4cd8997b42f8a5bc5b2cfac..abaaa2e558632f8eacd67a436f86985098d4c3cf 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h -@@ -55,6 +55,8 @@ enum VisitSource { +@@ -56,6 +56,8 @@ enum VisitSource { SOURCE_SAFARI_IMPORTED = 5, SOURCE_ACTOR = 6, // Added by the GLIC actor. SOURCE_OS_MIGRATION_IMPORTED = 7, diff --git a/patches/components-metrics-BUILD.gn.patch b/patches/components-metrics-BUILD.gn.patch index 4d4e26172e1..8a6f0e31978 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 0e35ba2dc5a680feabccfdbe1e41739e20992d7f..cf3bf58278bd2f82297aae3787ec7734fe53e308 100644 +index 90d4450f792ae0f6ce742ad874470b49b4757229..c4e08b81a2011ef8908ec8e0097eb690bc959dab 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn -@@ -348,6 +348,7 @@ if (!is_cronet_build || is_ios) { +@@ -351,6 +351,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 f975fc6c7e0..bf7cedd67d0 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 c9547697e66c877b42b117cf8f9b8344423812c9..9afd78c5f7882b7a148a4b83ff4b7aeb40b986fb 100644 +index ccddea6c87e6d4ede3b6cbf6a6c14301c69f029c..100094623e5b51d18d03d50efd8245c4f90c4595 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -380,6 +380,7 @@ static_library("browser") { +@@ -381,6 +381,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] @@ -10,7 +10,7 @@ index c9547697e66c877b42b117cf8f9b8344423812c9..9afd78c5f7882b7a148a4b83ff4b7aeb configs += [ "//build/config/compiler:wexit_time_destructors" ] -@@ -1008,6 +1009,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") { +@@ -1010,6 +1011,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 01642bde2cf..f425373bdcd 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 41fdea1f4fea7da1f7b71130490556731db8b531..2f83bde3b682a1740b753586f15f08ee399ae3eb 100644 +index 9c92155ff969c0af920b8db9e1a0f84186cf9127..2bd3845e294ed6cc276f4df87334ea9227d8e11d 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -1267,6 +1267,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { +@@ -1261,6 +1261,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { base::MakeRefCounted(provider_client_.get(), this); search_provider_ = search_provider.get(); providers_.push_back(std::move(search_provider)); @@ -10,7 +10,7 @@ index 41fdea1f4fea7da1f7b71130490556731db8b531..2f83bde3b682a1740b753586f15f08ee } // Providers run in the order they're added. Add `HistoryURLProvider` after // `SearchProvider` because: -@@ -1539,6 +1540,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type, +@@ -1533,6 +1534,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type, StartStopTimer(); } diff --git a/patches/components-omnibox-composebox-BUILD.gn.patch b/patches/components-omnibox-composebox-BUILD.gn.patch index 490687541d5..7e2f1e25524 100644 --- a/patches/components-omnibox-composebox-BUILD.gn.patch +++ b/patches/components-omnibox-composebox-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/composebox/BUILD.gn b/components/omnibox/composebox/BUILD.gn -index 432f351e331b257218be33c95be99d4ccdf2191d..c383f6a53559377437ff1f00092fe2e0522c3ea8 100644 +index 58767e126c01726eb58ce41a7503b547647db3ca..5f7c506a81fc2d2e1fc16f27a097e186af804383 100644 --- a/components/omnibox/composebox/BUILD.gn +++ b/components/omnibox/composebox/BUILD.gn @@ -5,6 +5,7 @@ diff --git a/patches/components-os_crypt-common-keychain_password_mac.mm.patch b/patches/components-os_crypt-common-keychain_password_mac.mm.patch index 48cedb33b93..de432a4b645 100644 --- a/patches/components-os_crypt-common-keychain_password_mac.mm.patch +++ b/patches/components-os_crypt-common-keychain_password_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/components/os_crypt/common/keychain_password_mac.mm b/components/os_crypt/common/keychain_password_mac.mm -index 66e0c5e9779959bcc45ef1f274f98a00de1c01e1..ea558247efc3a90b36613d4324f883239fb2fdd9 100644 +index f240dc22ee391c98c8768af7141b7447b6507cc6..de1e195a1e090ee954e9fb8c00fead30434e2cbd 100644 --- a/components/os_crypt/common/keychain_password_mac.mm +++ b/components/os_crypt/common/keychain_password_mac.mm -@@ -111,12 +111,14 @@ base::expected GetPasswordImpl( +@@ -110,12 +110,14 @@ base::expected GetPasswordImpl( // static KeychainPassword::KeychainNameType& KeychainPassword::GetServiceName() { diff --git a/patches/components-os_crypt-sync-BUILD.gn.patch b/patches/components-os_crypt-sync-BUILD.gn.patch index edd256b180c..525642cf9aa 100644 --- a/patches/components-os_crypt-sync-BUILD.gn.patch +++ b/patches/components-os_crypt-sync-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/os_crypt/sync/BUILD.gn b/components/os_crypt/sync/BUILD.gn -index 57b209f51ef1629f1201e4ba5d713c0ce32ebb24..9c480d585d1f7ef514941e3cac19a9702c0bd1a8 100644 +index 2ee822cd0c8293c7a742ef4a07499043643f7ac0..62e8ff181b209980986690022afc5c8f2036c76f 100644 --- a/components/os_crypt/sync/BUILD.gn +++ b/components/os_crypt/sync/BUILD.gn -@@ -100,6 +100,7 @@ component("sync") { +@@ -98,6 +98,7 @@ component("sync") { } else if (is_posix || is_fuchsia) { sources += [ "os_crypt_posix.cc" ] } diff --git a/patches/components-os_crypt-sync-key_storage_kwallet.cc.patch b/patches/components-os_crypt-sync-key_storage_kwallet.cc.patch index 24a358f0fc8..bf65cd58a7b 100644 --- a/patches/components-os_crypt-sync-key_storage_kwallet.cc.patch +++ b/patches/components-os_crypt-sync-key_storage_kwallet.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/os_crypt/sync/key_storage_kwallet.cc b/components/os_crypt/sync/key_storage_kwallet.cc -index 0f5d4c9a6267ece46ccd9fa35d04d7c63a7f3ca5..9bddf3bd396f3c77c698c296583a33f678416197 100644 +index b3ec51a1cd22be2e236bcc9f9429c3f0b9a13ca6..d73a588f8d196f6eb6fba08b230b20cd2f9ad887 100644 --- a/components/os_crypt/sync/key_storage_kwallet.cc +++ b/components/os_crypt/sync/key_storage_kwallet.cc @@ -127,6 +127,7 @@ std::optional KeyStorageKWallet::GetKeyImpl() { diff --git a/patches/components-os_crypt-sync-os_crypt_win.cc.patch b/patches/components-os_crypt-sync-os_crypt_win.cc.patch index 8d2148e9309..e1d64e79634 100644 --- a/patches/components-os_crypt-sync-os_crypt_win.cc.patch +++ b/patches/components-os_crypt-sync-os_crypt_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/os_crypt/sync/os_crypt_win.cc b/components/os_crypt/sync/os_crypt_win.cc -index 6cb720a5e1fc560ff18b800470e610ff92e47a05..9b2a0bda54324521e9d0069be74f017c1e77120d 100644 +index 0c57faafad86957ff1fb85c4861e99224da35ffc..c933106d581ea19ee544f49657d0bcc07ca84297 100644 --- a/components/os_crypt/sync/os_crypt_win.cc +++ b/components/os_crypt/sync/os_crypt_win.cc -@@ -195,6 +195,7 @@ bool OSCryptImpl::DecryptString16(const std::string& ciphertext, +@@ -196,6 +196,7 @@ bool OSCryptImpl::DecryptString16(const std::string& ciphertext, bool OSCryptImpl::EncryptString(const std::string& plaintext, std::string* ciphertext) { @@ -10,7 +10,7 @@ index 6cb720a5e1fc560ff18b800470e610ff92e47a05..9b2a0bda54324521e9d0069be74f017c if (use_legacy_) return EncryptStringWithDPAPI(plaintext, ciphertext); -@@ -220,6 +221,7 @@ bool OSCryptImpl::EncryptString(const std::string& plaintext, +@@ -221,6 +222,7 @@ bool OSCryptImpl::EncryptString(const std::string& plaintext, bool OSCryptImpl::DecryptString(const std::string& ciphertext, std::string* plaintext) { diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index 4b1e268ab00..69fd6077c8e 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 4a9ce1fc25663077e84d7e5ad8f9a779a9f49396..c803fa4bd43173d1d6911759bdb6acb01d4c263f 100644 +index b947af03690c6978aad800e7409eb6f94fc11c4b..c286d819661014cd6d56969405f5080833862dce 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1383,6 +1383,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1384,6 +1384,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, // second section, the default behavior used when no per-type exception applies. bool PageInfo::ShouldShowPermission( const PageInfo::PermissionInfo& info) const { diff --git a/patches/components-password_manager-core-browser-password_store-BUILD.gn.patch b/patches/components-password_manager-core-browser-password_store-BUILD.gn.patch index 6b59467206f..02f5e98965b 100644 --- a/patches/components-password_manager-core-browser-password_store-BUILD.gn.patch +++ b/patches/components-password_manager-core-browser-password_store-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/password_store/BUILD.gn b/components/password_manager/core/browser/password_store/BUILD.gn -index 2814859af566a73871909bae13c7ed2e001107bb..5073f13f87fc81fd06566e978fc29d5c0319bcbd 100644 +index 7b65950bce4330cbab12ce01d4f029ab6d7e1cda..7df7bc7ec704766cb279ff640e181e5cd267d1ae 100644 --- a/components/password_manager/core/browser/password_store/BUILD.gn +++ b/components/password_manager/core/browser/password_store/BUILD.gn -@@ -74,6 +74,7 @@ source_set("password_store_impl") { +@@ -75,6 +75,7 @@ source_set("password_store_impl") { "password_data_type_controller_delegate_android.cc", "password_data_type_controller_delegate_android.h", ] diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 20669b179fb..4a4ea509607 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 8ebad29a3ddd52e1c90a05fbd35e166bd03ee7ca..150ff70218b97d02b3dc44beacb5eda2f61d973a 100644 +index f54d021cb655501008a07fda27165c7e62ffeea2..2ec800304c284babe6bb9d45e3e9b13fa5c8ca3d 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn @@ -6,7 +6,7 @@ import("//components/guest_view/buildflags/buildflags.gni") diff --git a/patches/components-permissions-android-BUILD.gn.patch b/patches/components-permissions-android-BUILD.gn.patch index a804b80b6b2..0adc36d0011 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 692571fa81e91df02e8eb043bf8559f5556c57f8..ac3a4ae741ff50a5b1b2ab665431dd918b02bd36 100644 +index d83599b6e1c9deba7bd5e6d2fdaf7b4ad89bfaad..c82044da8b142243d51fab9340365c0e0b5428c0 100644 --- a/components/permissions/android/BUILD.gn +++ b/components/permissions/android/BUILD.gn -@@ -210,6 +210,7 @@ android_library("java") { +@@ -207,6 +207,7 @@ android_library("java") { "//third_party/jni_zero:jni_zero_java", "//ui/android:ui_java", ] diff --git a/patches/components-permissions-permission_request_manager.cc.patch b/patches/components-permissions-permission_request_manager.cc.patch index 9fa1a31b30a..354a2046c0a 100644 --- a/patches/components-permissions-permission_request_manager.cc.patch +++ b/patches/components-permissions-permission_request_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc -index 76a5facb99e6adf831b86b12c6122d645ced19d0..3aabe6ae296ffab2d73c89453c368019e476c549 100644 +index 5d1114d0714b92aeb2d6cba6c87516e91be74b48..5b2d8d585a4a2f71879afb9692263bf13242e038 100644 --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc @@ -601,6 +601,7 @@ void PermissionRequestManager::OnVisibilityChanged( @@ -36,7 +36,7 @@ index 76a5facb99e6adf831b86b12c6122d645ced19d0..3aabe6ae296ffab2d73c89453c368019 DCHECK(current_request_ui_to_use_); if (!tab_is_active_) { -@@ -1957,7 +1959,7 @@ void PermissionRequestManager::OnTabActiveChanged() { +@@ -1965,7 +1967,7 @@ void PermissionRequestManager::OnTabActiveChanged() { return; } diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index b628cc606b0..dc9c4616275 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 17b98cc80f8985953e1df9aa2eee9d4882619672..ff857e611f16a6df331f51adc4384d7241d44f61 100644 +index fb15bca62a75be053d1a6f6074315243664b949b..32dab7fbf7b4b531e82eaa380ea5b6383c37db42 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc -@@ -711,6 +711,7 @@ std::string GetPermissionStringForUma( +@@ -714,6 +714,7 @@ std::string GetPermissionStringForUma( case ContentSettingsType::LOOPBACK_NETWORK: return "LoopbackNetwork"; default: diff --git a/patches/components-permissions-permission_util.cc.patch b/patches/components-permissions-permission_util.cc.patch index 9c3fff969d3..018c84cbb96 100644 --- a/patches/components-permissions-permission_util.cc.patch +++ b/patches/components-permissions-permission_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc -index 1e0b4bfd8b31f9ccbd663e8bb7c3990a9fa9c879..0da4dd644f3ab1a254bfdc16abd60e5217257efa 100644 +index 2f6fbe5270245ddb1ef82f097ac1258781acb66e..13e15be5c372a6835fbd08494ecdc326b5852851 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc @@ -116,6 +116,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequests( @@ -10,7 +10,7 @@ index 1e0b4bfd8b31f9ccbd663e8bb7c3990a9fa9c879..0da4dd644f3ab1a254bfdc16abd60e52 return permissions::GetUmaValueForRequests(request_type); } -@@ -215,6 +216,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequestType( +@@ -217,6 +218,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequestType( #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) case RequestType::kIdentityProvider: return RequestTypeForUma::PERMISSION_IDENTITY_PROVIDER; @@ -18,7 +18,7 @@ index 1e0b4bfd8b31f9ccbd663e8bb7c3990a9fa9c879..0da4dd644f3ab1a254bfdc16abd60e52 } } -@@ -554,6 +556,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( +@@ -556,6 +558,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( return ContentSettingsType::LOOPBACK_NETWORK; case PermissionType::NUM: break; diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch index 7048e235214..3d7f1bb54df 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 39bad3ef7fc191ca8f1ce2a140a48f65b235ac22..4d107938e953420aceeb4cabbd32e0ab12c5323b 100644 +index fd25f0b4cc846a0096b7ad12c8332f2c1e43f7fa..337a341071183dcee00da3a913e2f104d99cd800 100644 --- a/components/permissions/request_type.cc +++ b/components/permissions/request_type.cc -@@ -497,6 +497,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { +@@ -510,6 +510,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { return "window_management"; case permissions::RequestType::kIdentityProvider: return "identity_provider"; diff --git a/patches/components-policy-BUILD.gn.patch b/patches/components-policy-BUILD.gn.patch index 9beddf13447..b943a27cfe7 100644 --- a/patches/components-policy-BUILD.gn.patch +++ b/patches/components-policy-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/policy/BUILD.gn b/components/policy/BUILD.gn -index 966203a8b132d67e4f1a1c75381d024ddede9741..5c88d93f8c2dcb199db9338ed2b22148d5120865 100644 +index fd95e68ece8c0e6ddba269a407f47e176a44adbd..33d425b38db33f76af5716090ff88bb3a0beb81a 100644 --- a/components/policy/BUILD.gn +++ b/components/policy/BUILD.gn -@@ -101,6 +101,7 @@ action("generate_policy_templates") { +@@ -105,6 +105,7 @@ action("generate_policy_templates") { "--depfile", rebase_path(policy_templates_deps_file, root_build_dir), ] diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index 3ca9936a40c..d3c9fea1d01 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,8 +1,8 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index 328d9635e3dc1425190820334eee5930f58ac08a..b04d177e6288fbe51df11ca4a592744afcba5e23 100755 +index 81b84086b25c0479d0d68800fa7d115d4d3b0684..eceee58d34bf517ec8ed80118e2b6604ddc7be70 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py -@@ -1728,5 +1728,6 @@ def _WriteAppRestrictions(policies, policy_atomic_groups, target_platform, f, +@@ -1768,5 +1768,6 @@ def _WriteAppRestrictions(policies, policy_atomic_groups, target_platform, f, f.write('') diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch index 3fc0186b511..edd6b9a3e34 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 1ac4232b1afb34ef8bda76c9e9cf3dd1330b2e61..b99ba0aec6f6b1f982c8965bdde734688ea25d9b 100644 +index 9f35ad77ccca85a68d60b4d372c5ba846f462776..7a4709d7252420bbd7f220c37baf34a8193b58a7 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn -@@ -149,6 +149,7 @@ static_library("search_engines") { +@@ -151,6 +151,7 @@ static_library("search_engines") { "enterprise/site_search_policy_handler.h", ] } diff --git a/patches/components-sessions-BUILD.gn.patch b/patches/components-sessions-BUILD.gn.patch index 551200e7dfd..ae825578d8f 100644 --- a/patches/components-sessions-BUILD.gn.patch +++ b/patches/components-sessions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn -index ae3dde7d1e639cb7a3fbdf8022bfb5a7e816f937..a43d5b3e44128effaab512b18963363a26c71cd0 100644 +index dd0e64493e6dd4b973c15b4427afb31b9d5c72fb..a1870fa4d6ec55e587e1cf1c5322e9c983734e9e 100644 --- a/components/sessions/BUILD.gn +++ b/components/sessions/BUILD.gn @@ -44,6 +44,7 @@ if (!is_ios) { @@ -10,7 +10,7 @@ index ae3dde7d1e639cb7a3fbdf8022bfb5a7e816f937..a43d5b3e44128effaab512b18963363a } } else { source_set("sessions") { -@@ -155,6 +156,7 @@ source_set("shared") { +@@ -154,6 +155,7 @@ source_set("shared") { "//ui/gfx", "//url", ] diff --git a/patches/components-signin-internal-identity_manager-BUILD.gn.patch b/patches/components-signin-internal-identity_manager-BUILD.gn.patch index 935c331018d..21d8e35fe9f 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 46247d8976e4610af0d8ab544f7e277d5f76eba6..2c0d196027f408a28f79e25949762bf3dc4a54a1 100644 +index c6627a64e37ce25e938f006d61a012ef27cc4f67..4737160194745f1d9e558c744077b4ec88057584 100644 --- a/components/signin/internal/identity_manager/BUILD.gn +++ b/components/signin/internal/identity_manager/BUILD.gn @@ -143,6 +143,7 @@ source_set("identity_manager") { diff --git a/patches/components-strings-BUILD.gn.patch b/patches/components-strings-BUILD.gn.patch index 942ba2bab7d..bc75b4f47c8 100644 --- a/patches/components-strings-BUILD.gn.patch +++ b/patches/components-strings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn -index d408e22cc89bf87981eea2a2780cf8da4f46b670..91ddf4c7b9be75de43e700271bfd3f6013856d29 100644 +index 0523cc2c51a7187b7252f05592e2053b2cc60818..b2b9d1d0c14a346160de315ee23a573dfbaef5be 100644 --- a/components/strings/BUILD.gn +++ b/components/strings/BUILD.gn -@@ -43,6 +43,7 @@ grit_strings("components_strings") { +@@ -64,6 +64,7 @@ grit_strings("components_locale_settings") { if (is_android) { create_android_resources = true } diff --git a/patches/components-sync-protocol-device_info_specifics.proto.patch b/patches/components-sync-protocol-device_info_specifics.proto.patch index a97ae8b7544..e42d792bea7 100644 --- a/patches/components-sync-protocol-device_info_specifics.proto.patch +++ b/patches/components-sync-protocol-device_info_specifics.proto.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/device_info_specifics.proto b/components/sync/protocol/device_info_specifics.proto -index 59fa8788308f7689552b8d62f1e27ccbc9161dbe..4d02a301011729e70600557ec0e43f3c96d57f15 100644 +index 35bb386569d2fb13c7f7927d07d5c076ec8a79ef..80cff5bb43ae7a1989600949001b7416259494b0 100644 --- a/components/sync/protocol/device_info_specifics.proto +++ b/components/sync/protocol/device_info_specifics.proto @@ -17,6 +17,7 @@ option optimize_for = LITE_RUNTIME; diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch index 0a706d461a5..96021fe9b18 100644 --- a/patches/components-sync-protocol-protocol_sources.gni.patch +++ b/patches/components-sync-protocol-protocol_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni -index f2bda9c89283aff68f23d2ec05863062d237110a..5a6a02f1e3fce7a49d6fd3bd4581c49e6d139433 100644 +index 02757d3bd49547969ff52ad958e8ecd41e14f22e..5d5f08e9c6a4f6faeb4a4c7581075fbe2120f496 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -92,3 +92,4 @@ sync_protocol_sources = [ +@@ -93,3 +93,4 @@ sync_protocol_sources = [ "wifi_configuration_specifics.proto", "workspace_desk_specifics.proto", ] diff --git a/patches/components-sync_device_info-BUILD.gn.patch b/patches/components-sync_device_info-BUILD.gn.patch index 2253358b2b8..e2715c79ad8 100644 --- a/patches/components-sync_device_info-BUILD.gn.patch +++ b/patches/components-sync_device_info-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/BUILD.gn b/components/sync_device_info/BUILD.gn -index 2ce756e2131fa7e4b6472a78939ab41878e887cb..93f35cbf015bc23c3fe72a79fe30fcaf1fadb1d3 100644 +index d2059cb12f6624702ede57f25f57df91a9a7b7ad..d2d21fc837c50cab1efbb259aba99b08f5f4ab40 100644 --- a/components/sync_device_info/BUILD.gn +++ b/components/sync_device_info/BUILD.gn -@@ -89,6 +89,7 @@ static_library("sync_device_info") { +@@ -92,6 +92,7 @@ static_library("sync_device_info") { if (is_win) { sources += [ "local_device_info_util_win.cc" ] } diff --git a/patches/components-sync_device_info-device_info.h.patch b/patches/components-sync_device_info-device_info.h.patch index 425d60f35f6..78679ee525a 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 77c2c2a13bdb95af9dfe33f6910295bf9eb80916..c69f9f18fe87daf0a08581620314632a6f94ab9b 100644 +index e40c9a5e346dfab5d410719cfac5674b45de0587..79a6383023e08b980796a84b19679e4f6ccfab0a 100644 --- a/components/sync_device_info/device_info.h +++ b/components/sync_device_info/device_info.h -@@ -157,6 +157,7 @@ class DeviceInfo { +@@ -160,6 +160,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 659461e35d2..4cca777d478 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,8 +1,8 @@ diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc -index c3d74e39e6ad91faf7536f031a9a7cb4aab0602e..83c6d50e8b098d3198969ca7eadbe793792d50b2 100644 +index 1552600853586bcb2388ad46a94219dc1f7e0204..dfa3f3dc1451569083a7011af16bcf7931c71e8d 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc -@@ -290,6 +290,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( +@@ -320,6 +320,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( GetSpecificsFieldNumberFromDataType(data_type)); } @@ -10,7 +10,7 @@ index c3d74e39e6ad91faf7536f031a9a7cb4aab0602e..83c6d50e8b098d3198969ca7eadbe793 return specifics; } -@@ -481,6 +482,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( +@@ -513,6 +514,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( for (const std::unique_ptr& change : entity_changes) { const std::string guid = change->storage_key(); @@ -18,7 +18,7 @@ index c3d74e39e6ad91faf7536f031a9a7cb4aab0602e..83c6d50e8b098d3198969ca7eadbe793 // Reupload local device if it was deleted from the server. if (local_cache_guid_ == guid && change->type() == EntityChange::ACTION_DELETE) { -@@ -491,7 +493,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( +@@ -523,7 +525,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( // Ignore any remote changes that have a cache guid that is or was this // local device. if (device_info_prefs_->IsRecentLocalCacheGuid(guid)) { @@ -27,7 +27,7 @@ index c3d74e39e6ad91faf7536f031a9a7cb4aab0602e..83c6d50e8b098d3198969ca7eadbe793 } if (change->type() == EntityChange::ACTION_DELETE) { -@@ -848,6 +850,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( +@@ -867,6 +869,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( return; } @@ -35,7 +35,7 @@ index c3d74e39e6ad91faf7536f031a9a7cb4aab0602e..83c6d50e8b098d3198969ca7eadbe793 // In the regular case for sync being disabled, wait for MergeFullSyncData() // before initializing the LocalDeviceInfoProvider. if (!syncer::IsInitialSyncDone( -@@ -1092,6 +1095,7 @@ void DeviceInfoSyncBridge::ExpireOldEntries() { +@@ -1111,6 +1114,7 @@ void DeviceInfoSyncBridge::ExpireOldEntries() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); CHECK(store_); TRACE_EVENT0("sync", "DeviceInfoSyncBridge::ExpireOldEntries"); diff --git a/patches/components-translate-core-common-BUILD.gn.patch b/patches/components-translate-core-common-BUILD.gn.patch index f0ee7ea0953..904aa5fa870 100644 --- a/patches/components-translate-core-common-BUILD.gn.patch +++ b/patches/components-translate-core-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/translate/core/common/BUILD.gn b/components/translate/core/common/BUILD.gn -index 8ee97fbf459d7516c9037ca8da7afb1c35aaee01..d50c360f37a77a37b6832b7547a4fea06e5f5b68 100644 +index dee8b37dfbcd88f127dd0a15ccbc141fe6d7c011..645b983599edb08296223d3c3632f7c078972932 100644 --- a/components/translate/core/common/BUILD.gn +++ b/components/translate/core/common/BUILD.gn -@@ -27,6 +27,8 @@ static_library("common") { +@@ -30,6 +30,8 @@ static_library("common") { "//third_party/metrics_proto", "//url", ] diff --git a/patches/components-unexportable_keys-mojom-unexportable_keys_mojom_traits.cc.patch b/patches/components-unexportable_keys-mojom-unexportable_keys_mojom_traits.cc.patch index 63a623b0338..d3ae68ff74e 100644 --- a/patches/components-unexportable_keys-mojom-unexportable_keys_mojom_traits.cc.patch +++ b/patches/components-unexportable_keys-mojom-unexportable_keys_mojom_traits.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/unexportable_keys/mojom/unexportable_keys_mojom_traits.cc b/components/unexportable_keys/mojom/unexportable_keys_mojom_traits.cc -index 9a2f6ca103d00375445e989c8071123f5fae69ec..1a8aa5b98cda60439a05bb0b4696d29f95a5c7fe 100644 +index 157ec02a5182431ee55e01fe833ad59bb61076c9..adce9d11945c4c2fb9630b0a3bb19acb25653268 100644 --- a/components/unexportable_keys/mojom/unexportable_keys_mojom_traits.cc +++ b/components/unexportable_keys/mojom/unexportable_keys_mojom_traits.cc @@ -29,6 +29,7 @@ EnumTraitsRewriteURLIfNecessary( url_to_load, browser_context, reverse_on_redirect); diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index d002121dd0b..b2839a9acce 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 7d101d40116bf743f940f32ba4c9b507aa9a235b..8f6a41705f177ef1c7870e893a59b0a7e7c35b48 100644 +index 26d4c43c9e09b58c764d38f8fbf62afc8f3a3c86..9230d0a2c760412e32dba67a7793a845af651341 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -3732,6 +3732,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -3750,6 +3750,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 7d101d40116bf743f940f32ba4c9b507aa9a235b..8f6a41705f177ef1c7870e893a59b0a7 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -5637,6 +5638,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -5656,6 +5657,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 3e05c8ce6ea..058dfee6ba4 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 2d8a70f5fc0f6c2dc2a7587b7bc2e43dbcee8f0e..2009df0eae1825a81d129c7354ae99d79b019847 100644 +index c5ee522e5ffb316bebfce23adb116b0b7cbd8ab8..f29c3cc3259df4cf438840d6fd0af175d9f9ca8e 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -5439,6 +5439,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -5473,6 +5473,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( candidate_site_for_cookies = net::SiteForCookies(top_frame_site); } @@ -10,7 +10,7 @@ index 2d8a70f5fc0f6c2dc2a7587b7bc2e43dbcee8f0e..2009df0eae1825a81d129c7354ae99d7 std::optional nonce = ComputeNonce(is_credentialless, fenced_frame_nonce_for_navigation); return net::IsolationInfo::Create( -@@ -5450,6 +5451,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -5484,6 +5485,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( std::optional RenderFrameHostImpl::ComputeNonce( bool is_credentialless, std::optional fenced_frame_nonce_for_navigation) { @@ -18,7 +18,7 @@ index 2d8a70f5fc0f6c2dc2a7587b7bc2e43dbcee8f0e..2009df0eae1825a81d129c7354ae99d7 // 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. -@@ -10046,6 +10048,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -10173,6 +10175,7 @@ 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 aed1bea44f6..86e06d2a1d8 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 345951d78dab34836dbb6d541f245cecaa2f1a67..1e403f217f77798587cabf23371fa226d3497e99 100644 +index 382b9ad9c6e8df480f6b36df04f799318233e249..84a63e44c509b271a82528373f19665917e76bcd 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5328,6 +5328,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5345,6 +5345,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( // SiteInstance is created in a new BrowsingInstance. scoped_refptr site_instance; if (params.opener_suppressed) { @@ -10,7 +10,7 @@ index 345951d78dab34836dbb6d541f245cecaa2f1a67..1e403f217f77798587cabf23371fa226 if (is_guest) { // For guests, noopener windows can be created in a new BrowsingInstance // as long as they preserve the guest's StoragePartition. -@@ -5423,7 +5424,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5442,7 +5443,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-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index b4d8a1d1865..3aa08abd72e 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 20b61c2dfc3433f02f5c6b8f25386b8a9a6011db..100ab767232b8a6ebb9afd7d4077ac48fdd2a6bf 100644 +index 5487c3756c60389a3442c2e59a08c91890fb6f87..ea56692d02ac934885ab03a29bd624daa5328c80 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn -@@ -62,6 +62,7 @@ source_set("common") { +@@ -64,6 +64,7 @@ source_set("common") { # must not link to this because it will duplicate the code in the component # build. visibility = [ "//content/*" ] diff --git a/patches/content-common-frame.mojom.patch b/patches/content-common-frame.mojom.patch index eb57279ee79..6ad97676253 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 ecfe129905639e9b7a5ed973017539cfaec9c2af..3016e1886750dcbb92e3a598831946fba622ddf3 100644 +index 19dbb921c9644522588ff74d0a1925f826736957..fabb2c006d9f8c42868ce81cbd4ccbf2a191d8d8 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom -@@ -586,6 +586,7 @@ struct CreateNewWindowParams { +@@ -593,6 +593,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 4b08cd31efc..849e1a2f989 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 b9656de7a8fef51d329bd5d102ef0eb6260a58ec..25b4b6584b79dc12985fbcde67487050098698d5 100644 +index 30870710ca42d8f709510ddea300536a9261fb49..0f71a2203d813e28775ebe7c7434e2e291330e47 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn -@@ -749,6 +749,7 @@ source_set("browser_sources") { +@@ -758,6 +758,7 @@ source_set("browser_sources") { if (use_clang_profiling_inside_sandbox) { sources += [ "profiling_utils.h" ] } diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index acc8c128ed7..b61896a47f6 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 cd9a5bb5b14a00b555f86bee503fc3f8d51db80b..79caedb27a2aea01770fe0ef6c7091b5525b4181 100644 +index 6ee766c52202804adc532b1585224b4e35239f9a..074f5bdead480c392b53761867b0209fadea8b10 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4804,6 +4804,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4820,6 +4820,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/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 1319fa0d806..36d9994775b 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 5f63c25b196e8303c63f01b0921ea162fe588df6..8f3e5466fa464af7c97f02fccd26976f51c2fd44 100644 +index e0298d214ea21bab003b74c857f3354c268ca465..7cb97a9a057f9ad70296e4cd6de90e0b7e90283e 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 -@@ -1467,6 +1467,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, +@@ -1468,6 +1468,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, *request)) { return AuthRequiredResponse::AUTH_REQUIRED_RESPONSE_NO_ACTION; } diff --git a/patches/ios-build-bots-scripts-test_runner.py.patch b/patches/ios-build-bots-scripts-test_runner.py.patch index 580d724c0a1..6752429be9f 100644 --- a/patches/ios-build-bots-scripts-test_runner.py.patch +++ b/patches/ios-build-bots-scripts-test_runner.py.patch @@ -1,8 +1,8 @@ diff --git a/ios/build/bots/scripts/test_runner.py b/ios/build/bots/scripts/test_runner.py -index fd288ba93e7685fe9b2e04d6760bc96ed8a5274e..ea0768fe76a4b547fff105f57e51e0770272037d 100644 +index ce272919c24e5603347929097efbdf15c24f140d..3cd08e1121bb0d764e2abe2674a76adec0a9fd10 100644 --- a/ios/build/bots/scripts/test_runner.py +++ b/ios/build/bots/scripts/test_runner.py -@@ -398,6 +398,7 @@ class TestRunner(object): +@@ -404,6 +404,7 @@ class TestRunner(object): @staticmethod def remove_proxy_settings(): """removes any proxy settings which may remain from a previous run.""" diff --git a/patches/ios-chrome-app-BUILD.gn.patch b/patches/ios-chrome-app-BUILD.gn.patch index 5d061113981..d909716ad54 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 eba81ac589cb58124d22f0da9ac9cb42a501be1c..36806f85804fe2859e132a4687e1c08e41ebe8b5 100644 +index 9b6febe5678c88d1d896189fb12220cea63e4d96..3f2ab3abaa6586769f29cfc8c94b4189fbbd6cf4 100644 --- a/ios/chrome/app/BUILD.gn +++ b/ios/chrome/app/BUILD.gn -@@ -829,8 +829,7 @@ chrome_app("chrome") { +@@ -917,8 +917,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 4b7e383027f..4e0a5ec1a04 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 6e357700dcb3ff115eedaa52c53715dfbe39bc09..73d0529c8a69e21ca1922dba23f0448230535374 100644 +index b3d457e5427ac30d96c1e9fbd7dd6007a0e5528f..f16b2f1c21754cdd0828fc5f82210c5891e5c7a6 100644 --- a/ios/chrome/browser/flags/BUILD.gn +++ b/ios/chrome/browser/flags/BUILD.gn -@@ -120,6 +120,7 @@ source_set("flags") { +@@ -117,6 +117,7 @@ source_set("flags") { "//ios/web/common:web_view_creation_util", "//ios/web/public", ] diff --git a/patches/ios-chrome-browser-flags-about_flags.mm.patch b/patches/ios-chrome-browser-flags-about_flags.mm.patch index b480f8cb273..83e91c3bb70 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 c4dd29f4824eee3eca6ac689872e60f7ad7143dc..3fca2c5c5e300e721c1df11d15253be5b36af75a 100644 +index 9e51b01e0decbf4c32e80c4f33d99fc3b2754bcd..c8ecade073b46785bf279779c5e3050552fb4e0d 100644 --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -1407,6 +1407,7 @@ const FeatureEntry::FeatureVariation kPageActionMenuIconVariations[] = { +@@ -1403,6 +1403,7 @@ const FeatureEntry::FeatureVariation kAssistantContainerVariations[] = { // // When adding a new choice, add it to the end of the list. constexpr auto kFeatureEntries = std::to_array({ 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 66c56311fab..c4655cec60f 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 e8e3964d4ec7ea11cb2c9d0aed356d432df2a4c0..d75893d31fd2617856694dca7b7bbf674097835d 100644 +index 104ef507fa9a4ad0b92e3486cdb260295b276f3f..a311739b0e25a4a1c5a8625d29730589dba6d230 100644 --- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm +++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm -@@ -649,6 +649,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -578,6 +578,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { // Deprecated 01/2026. registry->RegisterListPref(kMagicStackSafetyCheckNotificationsShown); registry->RegisterListPref(kBottomOmniboxByDefault); @@ -10,7 +10,7 @@ index e8e3964d4ec7ea11cb2c9d0aed356d432df2a4c0..d75893d31fd2617856694dca7b7bbf67 } void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -1126,6 +1127,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -1041,6 +1042,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Deprecated 12/2025. registry->RegisterStringPref(kAutofillStatesDataDir, std::string()); registry->RegisterBooleanPref(prefs::kIosMiniMapShowNativeMap, true); 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 25e3c6840af..5b20930c0e2 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,8 +1,8 @@ diff --git a/ios/chrome/browser/sync/model/sync_service_factory.mm b/ios/chrome/browser/sync/model/sync_service_factory.mm -index 7df81c5dc1f7b5b17b259c30f37466625bf027b6..70dea3123c4a3e7262ecc23b2bf858a78d86cf6d 100644 +index 160f73946232a63f67ea9ace4cd939ec9ddb80aa..1d075f6e4fe308176d39caa3ac8068a1448a4fda 100644 --- a/ios/chrome/browser/sync/model/sync_service_factory.mm +++ b/ios/chrome/browser/sync/model/sync_service_factory.mm -@@ -197,7 +197,7 @@ std::unique_ptr BuildSyncService(ProfileIOS* profile) { +@@ -218,7 +218,7 @@ std::unique_ptr BuildSyncService(ProfileIOS* profile) { init_params.debug_identifier = profile->GetProfileName(); init_params.os_crypt_async = GetApplicationContext()->GetOSCryptAsync(); auto sync_service = diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 049c00f00b1..7afb28c76d5 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 6ea3f02025d04480826a2ed542dbbb39eeb65369..d9f2697e0a6fd3658f63e9d3c04fe005a8155d99 100644 +index 3b79182266f22c783b69b7dcfd9ffbb1c8a539cf..742d7fd3dfe7b9a4766045db2e4b124bf9a31e93 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1273,6 +1273,7 @@ component("net") { +@@ -1284,6 +1284,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-dns-BUILD.gn.patch b/patches/net-dns-BUILD.gn.patch index 7a8d8bdd067..67ccae10b49 100644 --- a/patches/net-dns-BUILD.gn.patch +++ b/patches/net-dns-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn -index c83337113e00bea81e6e79070ffd94b79a1d3162..e4b573648eb01250d26933fe732cf88d07d89cd5 100644 +index d8509119f1c9e527d2a89faad239e13dead54257..a20a3272b439e040919cb35896f88fe369bc4e52 100644 --- a/net/dns/BUILD.gn +++ b/net/dns/BUILD.gn -@@ -112,6 +112,7 @@ source_set("dns") { +@@ -122,6 +122,7 @@ source_set("dns") { "test_dns_config_service.cc", "test_dns_config_service.h", ] diff --git a/patches/net-dns-host_resolver_manager_job.cc.patch b/patches/net-dns-host_resolver_manager_job.cc.patch index 5e1bc9e7d43..aca9065e282 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 3d7eda059c34b74b637e2e3dba2c74883c03239a..6b8adaadb71f45a3e0b55e5e3d5ae04d0062ac30 100644 +index 7f41594d1856b17d4e07a73fd0736935f310ecde..245d82bae6bfd94bba9712747e3f9621d4d5b85a 100644 --- a/net/dns/host_resolver_manager_job.cc +++ b/net/dns/host_resolver_manager_job.cc -@@ -1098,6 +1098,7 @@ void HostResolverManager::Job::CompleteRequests( +@@ -1097,6 +1097,7 @@ void HostResolverManager::Job::CompleteRequests( } RecordJobHistograms(results, task_type); diff --git a/patches/net-socket-socks_connect_job.cc.patch b/patches/net-socket-socks_connect_job.cc.patch index a1519fcb2a6..d6bf292405a 100644 --- a/patches/net-socket-socks_connect_job.cc.patch +++ b/patches/net-socket-socks_connect_job.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/socket/socks_connect_job.cc b/net/socket/socks_connect_job.cc -index 548442034c228b51f52d0b33f4df7363fc32829b..54e5778b85c091a3a98f908523a4fca2bd203383 100644 +index a7af8f25be2ec7814c8d2f2f279b916813fe3f8c..7009a1f4d822a3ada8e0f9ab60cbe07d75b65b1a 100644 --- a/net/socket/socks_connect_job.cc +++ b/net/socket/socks_connect_job.cc @@ -176,9 +176,11 @@ int SOCKSConnectJob::DoSOCKSConnect() { diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index b3684a889a6..72bf691c4d7 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 2266ec1424b23841e0215ffefa4506f108368bc2..07494bfeab466205817d893b8069a04fb61fdbd4 100644 +index 5c92eec064e36fa4be5a57a769a4091a18e3396d..9d8838b5546dae371ea0b1850bc5ac6dfdacbb91 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -623,6 +623,7 @@ ResultCode LaunchWithoutSandbox( +@@ -622,6 +622,7 @@ ResultCode LaunchWithoutSandbox( base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; options.feedback_cursor_off = true; diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 8134bbc4188..e3af1fba05c 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index fe41eb9197024cf6a2d10171d113d2273eb3a082..c6fb2a028c7a185c8d0849747960c4c442c3d6bc 100644 +index 1ae92a6ddf9e7344da548ba39f8bebcdb3890683..1b0164b4e987c6355e645b199127129614efad14 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn @@ -204,6 +204,7 @@ component("cpp") { diff --git a/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch b/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch index 5a58ea642e7..c237795da28 100644 --- a/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch +++ b/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 -index 9068fa91e75da9f9a91641eaadff3c68be90d618..81d6b74b627c103f5f22e0446588d67be076adc8 100644 +index b1b3552cc3eb516709e59c14ce8eb11ffd84d9d1..2b385d054943853333da8e8dfd6286ae789bb2b8 100644 --- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 +++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 @@ -669,6 +669,18 @@ diff --git a/patches/third_party-android_deps-autorolled-BUILD.gn.patch b/patches/third_party-android_deps-autorolled-BUILD.gn.patch index b55d0a2c7ab..02e4611eb58 100644 --- a/patches/third_party-android_deps-autorolled-BUILD.gn.patch +++ b/patches/third_party-android_deps-autorolled-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_deps/autorolled/BUILD.gn -index caf7dfedbaf0c7713ecab765da053953f9c0c7a1..4f7484ca0f87eab6f87b752045f3240c5a3da61c 100644 +index bc92a8075afd8005280bb8a10239ec9124d5deb2..4e281b46294b7631a45ee207cac8173f35b5462d 100644 --- a/third_party/android_deps/autorolled/BUILD.gn +++ b/third_party/android_deps/autorolled/BUILD.gn @@ -1082,6 +1082,7 @@ template("define_autorolled_targets") { diff --git a/patches/third_party-blink-common-BUILD.gn.patch b/patches/third_party-blink-common-BUILD.gn.patch index 0301bd6f0bf..0c676832158 100644 --- a/patches/third_party-blink-common-BUILD.gn.patch +++ b/patches/third_party-blink-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/common/BUILD.gn b/third_party/blink/common/BUILD.gn -index f56621d3f7602c4d002b2ce406099e09ddb6a4c5..4f0554fe0dc981687acb35bfe1fbeea9034a4360 100644 +index 487451217eff58fcb354aa9c94360abc769ddb42..e02cd81fd85ff6494ff0f057f4ebf956d696aef0 100644 --- a/third_party/blink/common/BUILD.gn +++ b/third_party/blink/common/BUILD.gn -@@ -353,6 +353,7 @@ source_set("common") { +@@ -354,6 +354,7 @@ source_set("common") { # TODO(crbug.com/40031409): Fix code that adds exit-time destructors and # enable the diagnostic by removing this line. configs += [ "//build/config/compiler:no_exit_time_destructors" ] @@ -10,7 +10,7 @@ index f56621d3f7602c4d002b2ce406099e09ddb6a4c5..4f0554fe0dc981687acb35bfe1fbeea9 } test("blink_common_unittests") { -@@ -499,6 +500,7 @@ source_set("common_unittests_sources") { +@@ -500,6 +501,7 @@ source_set("common_unittests_sources") { # TODO(crbug.com/40031409): Fix code that adds exit-time destructors and # enable the diagnostic by removing this line. configs += [ "//build/config/compiler:no_exit_time_destructors" ] 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 4087a86da51..302d1ad28db 100644 --- a/patches/third_party-blink-common-permissions-permission_utils.cc.patch +++ b/patches/third_party-blink-common-permissions-permission_utils.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc -index 0d873c13f1463d37e0fcdeacf68a84817b6524ca..104a4bec1d4cf76cd9af9065cfe3ad4786821ede 100644 +index 9c1b4762fe932618ec85a86a8367dce706d23c0b..b8ded5061caed370f6d934e06bc70182709d048e 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) { +@@ -30,6 +30,7 @@ mojom::PermissionStatus ToPermissionStatus(const std::string& status) { std::string GetPermissionString(PermissionType permission) { switch (permission) { @@ -10,7 +10,7 @@ index 0d873c13f1463d37e0fcdeacf68a84817b6524ca..104a4bec1d4cf76cd9af9065cfe3ad47 case PermissionType::GEOLOCATION: return "Geolocation"; case PermissionType::GEOLOCATION_APPROXIMATE: -@@ -263,6 +264,7 @@ std::optional PermissionDescriptorInfoToPermissionType( +@@ -267,6 +268,7 @@ std::optional PermissionDescriptorInfoToPermissionType( bool clipboard_has_user_gesture, bool fullscreen_allow_without_user_gesture) { switch (name) { diff --git a/patches/third_party-blink-public-common-BUILD.gn.patch b/patches/third_party-blink-public-common-BUILD.gn.patch index 02012dc183c..b217b96d2aa 100644 --- a/patches/third_party-blink-public-common-BUILD.gn.patch +++ b/patches/third_party-blink-public-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/public/common/BUILD.gn b/third_party/blink/public/common/BUILD.gn -index 5c9ec078225e7b038ea5da4ed6dc23e3d23f13d4..15931ba7d1646123d194e6c58e44ce9e6eb09754 100644 +index 6c8ba7eac1b6478cab2e76f7581c9fe8856b8add..deb045d4ea2a638136213ced5b1e427da6df9f33 100644 --- a/third_party/blink/public/common/BUILD.gn +++ b/third_party/blink/public/common/BUILD.gn -@@ -390,6 +390,7 @@ source_set("headers") { +@@ -391,6 +391,7 @@ source_set("headers") { # TODO(crbug.com/40031409): Fix code that adds exit-time destructors and # enable the diagnostic by removing this line. configs += [ "//build/config/compiler:no_exit_time_destructors" ] diff --git a/patches/third_party-blink-public-mojom-BUILD.gn.patch b/patches/third_party-blink-public-mojom-BUILD.gn.patch index 71c1ebf8a10..8851c627a5a 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 a59bb1960b98796790f624b9d7571dc64eea5cf7..3be8729ae34a3e77525b47fbaeded301918a4fe7 100644 +index e386899595f12c27c6b6da39a36aadb61e9c74ac..140f039248ded4149285ad3335eabac8a68b9d6e 100644 --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn -@@ -1129,6 +1129,7 @@ mojom("mojom_platform") { +@@ -1134,6 +1134,7 @@ mojom("mojom_platform") { ] cpp_typemaps += shared_cpp_typemaps blink_cpp_typemaps += shared_cpp_typemaps diff --git a/patches/third_party-blink-renderer-bindings-core-v8-to_v8_traits.h.patch b/patches/third_party-blink-renderer-bindings-core-v8-to_v8_traits.h.patch index cecc682bc64..94161a1a2d1 100644 --- a/patches/third_party-blink-renderer-bindings-core-v8-to_v8_traits.h.patch +++ b/patches/third_party-blink-renderer-bindings-core-v8-to_v8_traits.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h b/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h -index e51a369a23bdfb9825610b34c5ca3c706bb89603..4009fd946e959b54a35b9bf6fe0d95ab6f8c31a3 100644 +index 1bf0d9d5debf62bb1e3b6447c5a2e436a5572ab5..3182c2943da0b2f9e16fcf6ab1c047260b0be856 100644 --- a/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h +++ b/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h -@@ -722,6 +722,7 @@ struct ToV8Traits>> { +@@ -749,6 +749,7 @@ struct ToV8Traits>> { return v8::Null(script_state->GetIsolate()); return ToV8Traits>::ToV8(script_state, *value); } diff --git a/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch b/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch index f32ef27545c..f367bfcae49 100644 --- a/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch +++ b/patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc -index 0b7789f8a755835cd292dedb0976ad13dfeaefd3..42cdd62401ca0ccc7851f9b14c016ebcbde9d9b4 100644 +index 03992b0de9a494d29c88a7bf26e5d09cb83ed61a..a0759a197450ccaca343c323c091b1d3a07e7554 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc -@@ -311,7 +311,7 @@ int GetMicrotasksScopeDepth(v8::Isolate* isolate, +@@ -310,7 +310,7 @@ int GetMicrotasksScopeDepth(v8::Isolate* isolate, } // namespace @@ -11,7 +11,7 @@ index 0b7789f8a755835cd292dedb0976ad13dfeaefd3..42cdd62401ca0ccc7851f9b14c016ebc ScriptState* script_state, const ClassicScript& classic_script, v8::ScriptOrigin origin, -@@ -357,7 +357,7 @@ v8::MaybeLocal V8ScriptRunner::CompileScript( +@@ -356,7 +356,7 @@ v8::MaybeLocal V8ScriptRunner::CompileScript( return script; } 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 f9b9184a271..33d8aee5fb1 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 ca5996cfa12f9cb6792a50af5e28d50a1c91d312..cd13916431be8ee76ebdbbde24051c9a624aa050 100644 +index 07b1d2f33ae1a787b1993f103b57ece2b1bc22cd..d306fc57fe51273a287d529fa445bcd171ed5cef 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -3231,6 +3231,7 @@ generated_interface_sources_in_modules = [ +@@ -3245,6 +3245,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 e7e812918b9..d31b61a1c77 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 ce95bf431cd9be464d39025f1d81f144ad2d664f..ed77ca02f92ee83197cf01aa62d2802cc8128655 100644 +index 18135a6a24f2da42e524e9a314a668611a21014c..5c6e7b085f246d4b21372bdb8442a64bd93a7c79 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1274,6 +1274,7 @@ static_idl_files_in_modules = [ +@@ -1277,6 +1277,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 1d9c096ce4c..9607fc035bc 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 90215a07d90cff3dc912825baab72b8c181c9f89..1198611a9a9870f08b61160da61eecc8d8a873cb 100644 +index 57e541795681bb8af270ad1a8df0f134d8b43492..b4bed3f86f7be2957b1a5cacb7bffa26035c35cd 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -@@ -7494,3 +7494,4 @@ def generate_interfaces(task_queue): +@@ -7605,3 +7605,4 @@ def generate_interfaces(task_queue): "InitIDLInterfacesForTesting", "init_idl_interfaces_for_testing", for_testing=True) diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 9ca9eb4080c..6c8be9c4283 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index c8135570f00e9bd737bd775478ea5a8642507d7a..a35565dcf5c9ca046593d16519bd645d1b4b205a 100644 +index 66ed65def5c45d87f2e6357228cfcafdd784ed9a..aaec3ba5b299370307031411f0cd4c78e0276abf 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -471,6 +471,7 @@ component("core") { diff --git a/patches/third_party-blink-renderer-core-dom-document.cc.patch b/patches/third_party-blink-renderer-core-dom-document.cc.patch index e428ae4e156..cf9d6060819 100644 --- a/patches/third_party-blink-renderer-core-dom-document.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-document.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index dde7e8993cb8e59d0cbc1a15fffaedb8b0a26688..78d4622c7275e5423032342796dab4f1c531d43f 100644 +index 18df9cce23d777e890a81e76c9866974c2fa6985..8f165d6377a4136fbaa584a76409770e6299f096 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -7578,6 +7578,7 @@ KURL Document::CompleteURLWithOverride( diff --git a/patches/third_party-blink-renderer-core-dom-events-event_dispatcher.cc.patch b/patches/third_party-blink-renderer-core-dom-events-event_dispatcher.cc.patch index 5b20d11166f..f62696ed146 100644 --- a/patches/third_party-blink-renderer-core-dom-events-event_dispatcher.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-events-event_dispatcher.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_dispatcher.cc b/third_party/blink/renderer/core/dom/events/event_dispatcher.cc -index fa06e6602e491adef9988108c5c4ba7183075316..cbfd119a3a4c1c146f7eb7a0a76122276e79a043 100644 +index 3527373538828145fe3692902ff1bde4c28f4640..a4b73a962f1054695af6925cb9750cc7be88d738 100644 --- a/third_party/blink/renderer/core/dom/events/event_dispatcher.cc +++ b/third_party/blink/renderer/core/dom/events/event_dispatcher.cc -@@ -440,7 +440,7 @@ inline void EventDispatcher::DispatchEventPostProcess( +@@ -437,7 +437,7 @@ inline void EventDispatcher::DispatchEventPostProcess( // Call default event handlers. While the DOM does have a concept of // preventing default handling, the detail of which handlers are called is an // internal implementation detail and not part of the DOM. diff --git a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch index d29538523d4..aa5ffe48f3e 100644 --- a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc -index 8df5b5d536183e4c0ee35b4aba0c0cb4eaa99a57..cbcc508c3a5d3d302705e57d3255dc08b5dea4cd 100644 +index e45e9b59c41e43e11194478c1b50e10d4d6affeb..9f7b1215ad4f8ea84b9d36f08bfa1d8929184656 100644 --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc -@@ -649,6 +649,7 @@ bool EventTarget::AddEventListenerInternal( +@@ -650,6 +650,7 @@ bool EventTarget::AddEventListenerInternal( event_type, listener, options, ®istered_listener); if (added) { CHECK(registered_listener); @@ -10,7 +10,7 @@ index 8df5b5d536183e4c0ee35b4aba0c0cb4eaa99a57..cbcc508c3a5d3d302705e57d3255dc08 if (options->hasSignal()) { // Instead of passing the entire |options| here, which could create a // circular reference due to |options| holding a Member, just -@@ -785,6 +786,7 @@ bool EventTarget::RemoveEventListenerInternal( +@@ -786,6 +787,7 @@ bool EventTarget::RemoveEventListenerInternal( ®istered_listener)) { return false; } diff --git a/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch b/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch index 96f51aef9ac..3d4b931ec95 100644 --- a/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch +++ b/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.cc b/third_party/blink/renderer/core/frame/cached_permission_status.cc -index 5db79ee31a48167a1c2d082dbb3527888fab580c..dc6cb707e3702ec857a016a8e273d552ab7c1c4f 100644 +index 1b294378ed1ea76ffce78586cdbf5cfcee667bbb..6c476eee29a17ef318e2acf3cfa6da93d921a00d 100644 --- a/third_party/blink/renderer/core/frame/cached_permission_status.cc +++ b/third_party/blink/renderer/core/frame/cached_permission_status.cc @@ -15,7 +15,6 @@ using mojom::blink::PermissionDescriptorPtr; @@ -10,7 +10,7 @@ index 5db79ee31a48167a1c2d082dbb3527888fab580c..dc6cb707e3702ec857a016a8e273d552 // static const char CachedPermissionStatus::kSupplementName[] = "CachedPermissionStatus"; -@@ -53,7 +52,7 @@ void CachedPermissionStatus::Trace(Visitor* visitor) const { +@@ -52,7 +51,7 @@ void CachedPermissionStatus::Trace(Visitor* visitor) const { void CachedPermissionStatus::RegisterClient( Client* client, const Vector& permissions) { 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 ee85b4323ee..eafd045ef86 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 c425735d53a8a79c9ce20c049506659c17b51be3..5dfb4c08d67deec585dfd4fa1af3b7ffb0e7713d 100644 +index 06efc300ee7a014759de6d0d61d0ced6c8bb965f..6f753f2bcc636c0b49dcb1d41dbc1e5fda15bc4e 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -501,6 +501,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 81ebc8891d2..aeb5c572823 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 f95a360b8daf4cb11608e794dae4bcedd9fe0e5f..5267428179a10b492e435a0093b6536af5cc4c1f 100644 +index 34e8e709326f520d341a2404eeae0f516287806e..746c81ee4421d2b14f60b2c97091a07d519f653a 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 -@@ -1318,6 +1318,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1319,6 +1319,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 2b4b5e3776b..9fe85f66e45 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 ef0f7a1ea6dbe572d8860f0059a113d7bbccb0d9..c10adaf1fa4ed81c39eeb5acd0a285eba02ecf34 100644 +index 32ac79cb86b04b2ea4a9a50ef1b4c4cd1d47fe07..0125900995bf48fdde022ef2173414384ee3bcf6 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 -@@ -342,6 +342,7 @@ class CORE_EXPORT HTMLCanvasElement final +@@ -350,6 +350,7 @@ class CORE_EXPORT HTMLCanvasElement final DOMMatrix* draw_transform, ExceptionState&); 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 dd2efe57325..c183a1b51ff 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 8c3d711bc424967b5dc9940dcb89d6d0d7c99e48..17d8912b3c6c943403dcbc8a69b6ca3c6ef80ef9 100644 +index aa899b08d2f64116f010768e0d4aa1bdf30efad3..7cf0baac1df73b7b5ed19752dbd35e04c1357b7c 100644 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -642,6 +642,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -641,6 +641,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-loader-mixed_content_checker.cc.patch b/patches/third_party-blink-renderer-core-loader-mixed_content_checker.cc.patch index a40a3fc7222..23f28acffb0 100644 --- a/patches/third_party-blink-renderer-core-loader-mixed_content_checker.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-mixed_content_checker.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/loader/mixed_content_checker.cc b/third_party/blink/renderer/core/loader/mixed_content_checker.cc -index d26ea92df9c007814412af78de5f651ad4a103fd..d2561fd8a20d334c639c416f293b6903c6cc48de 100644 +index 64e9f74ee12df6b39143e0ad66e9fc9108691d0a..4aeadf70722f61bb96ec6d87f8258e2645a278b6 100644 --- a/third_party/blink/renderer/core/loader/mixed_content_checker.cc +++ b/third_party/blink/renderer/core/loader/mixed_content_checker.cc @@ -299,6 +299,7 @@ bool RequestIsSubframeSubresource(Frame* frame) { diff --git a/patches/third_party-blink-renderer-core-loader-modulescript-module_script_loader.cc.patch b/patches/third_party-blink-renderer-core-loader-modulescript-module_script_loader.cc.patch index 9f63ba4554a..af493f9d334 100644 --- a/patches/third_party-blink-renderer-core-loader-modulescript-module_script_loader.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-modulescript-module_script_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc b/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc -index 1a189759ad267f269c99e0659d5f596d1b85abf3..3b4ddce9a60018953af90d0b60b41103535c5c11 100644 +index 682bae10ed624fb10ebb546cd51fc5512b499ce8..80a3f1e7ef41d5a745a9eee2d7085dfed245e89d 100644 --- a/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc +++ b/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc -@@ -186,6 +186,7 @@ void ModuleScriptLoader::FetchInternal( +@@ -187,6 +187,7 @@ void ModuleScriptLoader::FetchInternal( options.initiator_info.referrer = module_request.ReferrerString(); options.initiator_info.position = module_request.GetReferrerPosition(); } diff --git a/patches/third_party-blink-renderer-core-scheduler-scheduled_action.cc.patch b/patches/third_party-blink-renderer-core-scheduler-scheduled_action.cc.patch index 21689ad6948..bf4b104885d 100644 --- a/patches/third_party-blink-renderer-core-scheduler-scheduled_action.cc.patch +++ b/patches/third_party-blink-renderer-core-scheduler-scheduled_action.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/scheduler/scheduled_action.cc b/third_party/blink/renderer/core/scheduler/scheduled_action.cc -index 469354625cafe54d8ae654f4506271e13ea9deea..116539a27181a36238ab88cac4cbee521a0e1d00 100644 +index f16b775b33c44fc2e1ab6724b6da936c1c895404..de0defc3aebd1712e976809f99e88d1661c03c24 100644 --- a/third_party/blink/renderer/core/scheduler/scheduled_action.cc +++ b/third_party/blink/renderer/core/scheduler/scheduled_action.cc @@ -84,6 +84,7 @@ ScheduledAction::ScheduledAction(ScriptState* script_state, diff --git a/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch b/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch index ee8ee1421e7..0097a32bc7d 100644 --- a/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch +++ b/patches/third_party-blink-renderer-core-script-dynamic_module_resolver.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/script/dynamic_module_resolver.cc b/third_party/blink/renderer/core/script/dynamic_module_resolver.cc -index 377e5f3f6093142f04d9c6c7686903393a3dad48..1b907392b375819d86e320a9399563865e39d8fe 100644 +index 4b0f53f9bb6eeff7831c88303ab91353b231d47c..e4baf8833ad587a9d9b1697e7d923652612ef16a 100644 --- a/third_party/blink/renderer/core/script/dynamic_module_resolver.cc +++ b/third_party/blink/renderer/core/script/dynamic_module_resolver.cc @@ -315,6 +315,7 @@ void DynamicModuleResolver::ResolveDynamically( diff --git a/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch b/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch index f23a02c334e..05cbd5f0560 100644 --- a/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch +++ b/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/script/html_parser_script_runner.cc b/third_party/blink/renderer/core/script/html_parser_script_runner.cc -index 457a9b5aa545301b37be273f8fa4d517d8ead5d6..1587a2596e0340693cb7d0530a0faf7d17b5b8fd 100644 +index b3d713311dfd02668c3a589ddd9c5dd7159edb4e..fc4fe3bfde697789c1c5e2edf5403f59e2818446 100644 --- a/third_party/blink/renderer/core/script/html_parser_script_runner.cc +++ b/third_party/blink/renderer/core/script/html_parser_script_runner.cc @@ -270,6 +270,12 @@ void HTMLParserScriptRunner::PendingScriptFinished( diff --git a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch index 2c2d4625103..b9dda6b205b 100644 --- a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch +++ b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/script/script_loader.cc b/third_party/blink/renderer/core/script/script_loader.cc -index bf8e41ae992da9c8e79d0eed2e7a7d8567f05e23..179a144a26ef04da6be1f0f847b5e9f33d958020 100644 +index 7855d96701cbf9ee28ebd708f61e69ef97d9e94c..e0366cc13d3d7709dd123b9419100d51784b18ba 100644 --- a/third_party/blink/renderer/core/script/script_loader.cc +++ b/third_party/blink/renderer/core/script/script_loader.cc @@ -734,6 +734,7 @@ PendingScript* ScriptLoader::PrepareScript( diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 62805db9c26..310dd28205c 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 3b59a413462c08c437fa53488f9e9908f6a21f9d..bab90b777226ed3ecd448eb9f645218e858cdefa 100644 +index 22cb6c9703837b8d5ebf040dd457177bc7d3cc6a..24f8cd7685d0f7351505477735050abf2044df59 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -20,6 +20,7 @@ if (is_ios) { 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 efa42548cd6..ba32359a4e6 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,5 +1,5 @@ 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 07df84ea525b7cbfbeb393303678729ec325921b..a479e62dcc3732a2d13b47b34024a0d7ebfa6db0 100644 +index 3006cad0fbf9b8c171d585a3c46492783c26878c..df05c1dfb2a6c70065957a9ca2ba9011d07150ba 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 @@ -363,6 +363,7 @@ ImageData* BaseRenderingContext2D::getImageData( diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 8a9374a305a..8125cd4d44e 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 86a41c16dc22daa156d22dbc86e09471c4471323..f17e7a91c8b7fb7ff4e03528f52e4930da4697d8 100644 +index ccaa1ac8193cb6372ca572e4f9f680caaa0e94d7..8d2bba90000ddb8a0d1904a25c7cf799834f3287 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -1344,6 +1344,7 @@ void MediaDevices::DevicesEnumerated( +@@ -1466,6 +1466,7 @@ void MediaDevices::DevicesEnumerated( } } diff --git a/patches/third_party-blink-renderer-modules-permissions-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-permissions-BUILD.gn.patch index db82e9d3e72..3bffd058942 100644 --- a/patches/third_party-blink-renderer-modules-permissions-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-permissions-BUILD.gn.patch @@ -1,10 +1,12 @@ diff --git a/third_party/blink/renderer/modules/permissions/BUILD.gn b/third_party/blink/renderer/modules/permissions/BUILD.gn -index 2e4b14e09755ff0194454863c4de36e99a290253..f50482466991dc87a15c829dd728cc09fecc4e07 100644 +index 312a2db74139bdb6ade7dff60030f0655231b37a..db4a4819fd32a76c0982e4c0a03665d2fc441b09 100644 --- a/third_party/blink/renderer/modules/permissions/BUILD.gn +++ b/third_party/blink/renderer/modules/permissions/BUILD.gn -@@ -15,4 +15,5 @@ blink_modules_sources("permissions") { +@@ -15,6 +15,7 @@ blink_modules_sources("permissions") { "permissions.cc", "permissions.h", ] + import("//brave/components/brave_wallet/sources.gni") deps = brave_blink_renderer_modules_permissions_deps } + + source_set("unit_tests") { diff --git a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch index 26b51cd9929..e892cb465be 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -index 40a355dec4aad8d39567c404619959c0347b2ad6..986795cc515c7ab6974e32b44cee2d8747fa5efb 100644 +index 7084a5303edc0a2c88a9e23a490c39b8a307a410..7fa8bc20e7e2bd662b55c0219c16ab8ba67675e3 100644 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -@@ -201,6 +201,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus) +@@ -198,6 +198,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus) } NotShared AudioBuffer::getChannelData( @@ -10,7 +10,7 @@ index 40a355dec4aad8d39567c404619959c0347b2ad6..986795cc515c7ab6974e32b44cee2d87 unsigned channel_index, ExceptionState& exception_state) { if (channel_index >= channels_.size()) { -@@ -212,6 +213,7 @@ NotShared AudioBuffer::getChannelData( +@@ -209,6 +210,7 @@ NotShared AudioBuffer::getChannelData( return NotShared(nullptr); } @@ -18,7 +18,7 @@ index 40a355dec4aad8d39567c404619959c0347b2ad6..986795cc515c7ab6974e32b44cee2d87 return getChannelData(channel_index); } -@@ -223,13 +225,15 @@ NotShared AudioBuffer::getChannelData(unsigned channel_index) { +@@ -220,13 +222,15 @@ NotShared AudioBuffer::getChannelData(unsigned channel_index) { return NotShared(channels_[channel_index].Get()); } @@ -37,7 +37,7 @@ index 40a355dec4aad8d39567c404619959c0347b2ad6..986795cc515c7ab6974e32b44cee2d87 int32_t channel_number, size_t buffer_offset, ExceptionState& exception_state) { -@@ -266,6 +270,7 @@ void AudioBuffer::copyFromChannel(NotShared destination, +@@ -263,6 +267,7 @@ void AudioBuffer::copyFromChannel(NotShared destination, DCHECK(dst.data()); dst.first(count).copy_from(src.subspan(buffer_offset, count)); diff --git a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch index 113963ec4de..d800c59a930 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc -index 9f2c3f443f4188f40c7562a98ffc536b55ba040b..a1a60bb1c5275517e61f2d56a710daf2e9da6b6d 100644 +index 4ff2fecc93e20ff6d756eaabd783fff02bb93314..8b9dd6dd3fe32d4b0cd19a7d0c28bdbcc461e727 100644 --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc @@ -114,6 +114,7 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array, 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 2387fe4ab29..6135ecfbd74 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 132e1b3724f9d0cc48d6873d2c7c65870a1c8617..1eabdf76cc0e48aebd2d4708f2a8c3fe885e6fe0 100644 +index 18aaa25ad71c65f717ca58a936bd1c78a6a537ec..da4fb0927d0852ef80627a3ff4671f35e8d73122 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 @@ -4774,6 +4774,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 09423a42a0d..ae305d0d50b 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 469fc4dd30580f0fbbe89ad9bef52e2c694377a7..6e4f73cd411b2c9b315c6b2bb5e964f79c5d029b 100644 +index e6f8fef21367b8ed924a23d67c3b9752e7105cbc..d2240a29988f40f2dbc037c230fe7a3bb9721d48 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 @@ -3425,6 +3425,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( @@ -138,7 +138,7 @@ index 469fc4dd30580f0fbbe89ad9bef52e2c694377a7..6e4f73cd411b2c9b315c6b2bb5e964f7 DCHECK(uniform_location); if (!ValidateUniformLocation("getUniform", uniform_location, program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); -@@ -4605,6 +4622,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4606,6 +4623,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 469fc4dd30580f0fbbe89ad9bef52e2c694377a7..6e4f73cd411b2c9b315c6b2bb5e964f7 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4629,6 +4647,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4632,6 +4650,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 469fc4dd30580f0fbbe89ad9bef52e2c694377a7..6e4f73cd411b2c9b315c6b2bb5e964f7 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4703,6 +4722,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4706,6 +4725,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 469fc4dd30580f0fbbe89ad9bef52e2c694377a7..6e4f73cd411b2c9b315c6b2bb5e964f7 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -5065,6 +5085,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -5068,6 +5088,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 39668d1a47b..81a5f9287c4 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 83ebf4a21a9d42b307a8a2108e118174d6d62f0e..26fb47930852fb1e7501ed5469895e3e67770af2 100644 +index eb2472737bd6e20a6bf9fdb311a412036d7dbff7..c428c6fd5c2f755805bdaed1919bb2d9edd2086c 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1981,6 +1981,7 @@ component("platform") { +@@ -1984,6 +1984,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 317ae681d0e..5570bffb641 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 @@ -2,7 +2,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 index 9ba8c0055a45eb0a27a6374c52966c83d8384f12..a1f649358b447368d18f213defdc2df38d336f36 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -839,6 +839,11 @@ +@@ -875,6 +875,11 @@ public: true, status: "stable", }, @@ -30,7 +30,7 @@ index 9ba8c0055a45eb0a27a6374c52966c83d8384f12..a1f649358b447368d18f213defdc2df3 }, { name: "FileSystemAccessLockingScheme", -@@ -3593,6 +3600,7 @@ +@@ -3716,6 +3723,7 @@ { name: "MiddleClickAutoscroll", status: "test", diff --git a/patches/third_party-lit-v3_0-BUILD.gn.patch b/patches/third_party-lit-v3_0-BUILD.gn.patch index d175cd40cfd..0e0a54490a4 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 9c16ef2655992d0e40731311bc681e4d2fce0004..d5a1e50d3b137b0aca3dd0dbf98050de869b43a3 100644 +index 9a1c53ea74b37e14d9df354f9797ca41c1797209..69aecce56bb6ac7b87ca389fa6fb7d92df252545 100644 --- a/third_party/lit/v3_0/BUILD.gn +++ b/third_party/lit/v3_0/BUILD.gn -@@ -145,6 +145,7 @@ ts_library("build_ts") { +@@ -147,6 +147,7 @@ ts_library("build_ts") { "//ui/webui/resources/cr_components/searchbox:build_ts", "//ui/webui/resources/cr_components/theme_color_picker:build_ts", "//ui/webui/resources/cr_elements:build_ts", @@ -10,7 +10,7 @@ index 9c16ef2655992d0e40731311bc681e4d2fce0004..d5a1e50d3b137b0aca3dd0dbf98050de ] tsconfig_base = "tsconfig_base.json" composite = true -@@ -229,6 +230,7 @@ ts_library("build_ts") { +@@ -231,6 +232,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 4d3437ee555..9d6a815bd8b 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 69030552006f843d40455aac8f9e1a4d112936ed..44f26be718ddb06062d8bebcda233e2c27d62c73 100644 +index 9a309d64f66a1f873971c23b52ede8ed1f0aba4f..ff5580c127f819533b6524b470de04cfc27c8b46 100644 --- a/third_party/polymer/v3_0/BUILD.gn +++ b/third_party/polymer/v3_0/BUILD.gn @@ -19,6 +19,7 @@ js_files = [ @@ -10,7 +10,7 @@ index 69030552006f843d40455aac8f9e1a4d112936ed..44f26be718ddb06062d8bebcda233e2c js_files += [ "iron-a11y-announcer/iron-a11y-announcer.js", "iron-a11y-keys/iron-a11y-keys.js", -@@ -226,11 +227,13 @@ ts_library("library") { +@@ -220,11 +221,13 @@ ts_library("library") { # Also needed on LaCros for Print Preview. Remove once CrOS Print Preview # launches. if (is_chromeos) { @@ -24,7 +24,7 @@ index 69030552006f843d40455aac8f9e1a4d112936ed..44f26be718ddb06062d8bebcda233e2c definitions += [ "components-chromium/iron-a11y-announcer/iron-a11y-announcer.d.ts", "components-chromium/iron-a11y-keys/iron-a11y-keys.d.ts", -@@ -273,4 +276,5 @@ ts_library("library") { +@@ -267,4 +270,5 @@ ts_library("library") { "components-chromium/paper-tooltip/paper-tooltip.d.ts", ] } diff --git a/patches/third_party-rust-bitflags-v2-BUILD.gn.patch b/patches/third_party-rust-bitflags-v2-BUILD.gn.patch index 839da0a71f7..0f264db5aaf 100644 --- a/patches/third_party-rust-bitflags-v2-BUILD.gn.patch +++ b/patches/third_party-rust-bitflags-v2-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/bitflags/v2/BUILD.gn b/third_party/rust/bitflags/v2/BUILD.gn -index 6c17b8f85a49d02305cf2f8a845ab04b97578cb2..7a09cd4446337ed2869cfa16b9378aa65eb55047 100644 +index d2dfe6e748a2336f11709c30dfa3edfb2f5f5ea2..de7529856b3802bee3119cdc8863341a9475d6c0 100644 --- a/third_party/rust/bitflags/v2/BUILD.gn +++ b/third_party/rust/bitflags/v2/BUILD.gn -@@ -98,4 +98,5 @@ cargo_crate("lib") { +@@ -100,4 +100,5 @@ cargo_crate("lib") { executable_configs += _configs_to_add proc_macro_configs -= _configs_to_remove proc_macro_configs += _configs_to_add diff --git a/patches/third_party-rust-regex_automata-v0_4-BUILD.gn.patch b/patches/third_party-rust-regex_automata-v0_4-BUILD.gn.patch index b0519848434..47e9cc57f56 100644 --- a/patches/third_party-rust-regex_automata-v0_4-BUILD.gn.patch +++ b/patches/third_party-rust-regex_automata-v0_4-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/rust/regex_automata/v0_4/BUILD.gn b/third_party/rust/regex_automata/v0_4/BUILD.gn -index 452be1de7ea15c871bbbf52a6999f09b8a0be365..1a9157d4b4dbd1bf645b7d08b493c2318e9fcff3 100644 +index ec0574d7d3b0cdaae43605bad34c7f036c4a0355..04ea098a81766afcf3c515f6ddc6f21009687e0c 100644 --- a/third_party/rust/regex_automata/v0_4/BUILD.gn +++ b/third_party/rust/regex_automata/v0_4/BUILD.gn @@ -135,4 +135,6 @@ cargo_crate("lib") { diff --git a/patches/third_party-rust-syn-v2-BUILD.gn.patch b/patches/third_party-rust-syn-v2-BUILD.gn.patch index 4a74ee47f35..c7ce5747fb3 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 5f8ecaa6fefbceeecb053065cb3010e4bb56472c..b2a6d261903ef6be36d35a65e096a9b8303ba878 100644 +index 94a5067e48c24eb3d1cf9f06fc6189edb370b96c..eadd299716c455ce5f356ea916709d4d94df0e19 100644 --- a/third_party/rust/syn/v2/BUILD.gn +++ b/third_party/rust/syn/v2/BUILD.gn @@ -129,4 +129,5 @@ cargo_crate("lib") { diff --git a/patches/third_party-search_engines_data-BUILD.gn.patch b/patches/third_party-search_engines_data-BUILD.gn.patch index be5d0f8f31e..12fbc3059b5 100644 --- a/patches/third_party-search_engines_data-BUILD.gn.patch +++ b/patches/third_party-search_engines_data-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/search_engines_data/BUILD.gn b/third_party/search_engines_data/BUILD.gn -index 3a575ca6b830dcd18ca88e0e2c8f9f06f7023dd8..7e998561f9df8ab4fa487d2fd25488b7e4aefa2b 100644 +index 7cea872118fbadfacb42ce97c3222007a6b047fd..def1687351a2274bf1c0729da9655dccb6f0870b 100644 --- a/third_party/search_engines_data/BUILD.gn +++ b/third_party/search_engines_data/BUILD.gn @@ -17,6 +17,7 @@ json_to_struct("prepopulated_engines") { 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 a9ef7496198..c4e1f44adef 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 522e1653d7c13bf941d3a3ab7ff4cbef96b9b52e..04e559e57383ebccb18f43e89929656b0d51dd3c 100644 +index 629ff0ff71eaa57623d6a993ab45849e305ee619..fcafeecb53d33a1861a89474771730720715c138 100644 --- a/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py +++ b/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py -@@ -501,3 +501,4 @@ def FindAllAvailableBrowsers(finder_options, device): +@@ -506,3 +506,4 @@ def FindAllAvailableBrowsers(finder_options, device): return [] return browsers diff --git a/patches/third_party/catapult/telemetry-telemetry-page-shared_page_state.py.patch b/patches/third_party/catapult/telemetry-telemetry-page-shared_page_state.py.patch index 7c05133d57b..a5f4a5e5201 100644 --- a/patches/third_party/catapult/telemetry-telemetry-page-shared_page_state.py.patch +++ b/patches/third_party/catapult/telemetry-telemetry-page-shared_page_state.py.patch @@ -1,5 +1,5 @@ diff --git a/telemetry/telemetry/page/shared_page_state.py b/telemetry/telemetry/page/shared_page_state.py -index df3f42352963923e7f64961afbb2cb9169be7625..9e6c8050e9ce4dce87590f8e5dda6a6959b75bd4 100644 +index 9182ec48bb61d42c80fbc20ca0833bd6b02aaceb..1b1bccb7fd1404dcaf15d6e00fe65214ebceff50 100644 --- a/telemetry/telemetry/page/shared_page_state.py +++ b/telemetry/telemetry/page/shared_page_state.py @@ -219,6 +219,7 @@ class SharedPageState(story_module.SharedState): 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 44e5d35cdc8..f8804615e68 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 dd18097fd82f179598ef556ce05a5c7a51861d4b..6ad03e667f532599c1c1d84fd77fa551fb123322 100644 +index 4c8f9a15c4ce99ad91fd070bd8000b4ae92b1251..bc08ab662e58e4f9a88f4278eab40b07c94fbf3d 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni -@@ -2737,6 +2737,7 @@ grd_files_unbundled_sources = [ +@@ -2748,6 +2748,7 @@ grd_files_unbundled_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-protocol_client-InspectorBackend.ts.patch b/patches/third_party/devtools-frontend/src/front_end-core-protocol_client-InspectorBackend.ts.patch index 3c99f49d89c..496372ad053 100644 --- a/patches/third_party/devtools-frontend/src/front_end-core-protocol_client-InspectorBackend.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-core-protocol_client-InspectorBackend.ts.patch @@ -1,5 +1,5 @@ diff --git a/front_end/core/protocol_client/InspectorBackend.ts b/front_end/core/protocol_client/InspectorBackend.ts -index 7d511cb1a90f57a2ab31c9037de46885e7c100eb..912e58307e97e36f2a7526e9b04f57d86a26ada1 100644 +index b200b10d8d8c73112c03961f0e5c429077a3c26c..8dfd268abbd662cb9dd39e1c89a32f6075ab29da 100644 --- a/front_end/core/protocol_client/InspectorBackend.ts +++ b/front_end/core/protocol_client/InspectorBackend.ts @@ -77,6 +77,7 @@ export class InspectorBackend implements InspectorBackendCommands.InspectorBacke 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 26004c9e129..4deaf4b0d13 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 b27b6d20ba7ca9a938fba69b82fd4eab4ea71db8..ffe276ac5fa1ec9f143a827813206a7d125f1444 100644 +index dd185c45adcf06742ecef1fa9ea991552a3cc4a9..800bad912e5f07c819b153cf9969de2c2e5bd46e 100644 --- a/front_end/core/sdk/NetworkManager.ts +++ b/front_end/core/sdk/NetworkManager.ts -@@ -1561,6 +1561,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { +@@ -1608,6 +1608,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { return `${host}:${port}`; } } diff --git a/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch b/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch index e4d4ae06b65..d173d43631f 100644 --- a/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch +++ b/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch @@ -1,8 +1,8 @@ diff --git a/front_end/design_system_tokens.css b/front_end/design_system_tokens.css -index 4170672948f4103c2218777722030fdfbf77398b..06aaf91a8753bb490870f0a3d340ca4fd254f0b3 100644 +index de3f89a6528036341dec59288442ba24ee451c65..caba036a1e7a0048be7e2f3f159a57e35f840b12 100644 --- a/front_end/design_system_tokens.css +++ b/front_end/design_system_tokens.css -@@ -283,7 +283,7 @@ +@@ -387,7 +387,7 @@ /* Outlines */ --sys-color-outline: var(--ref-palette-neutral-variant60); 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 8750be11fff..294761320b0 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,5 +1,5 @@ diff --git a/front_end/panels/application/ApplicationPanelSidebar.ts b/front_end/panels/application/ApplicationPanelSidebar.ts -index ba633a83360c2d4650d74aa583d168724b571d49..07b371bd830fa1fcefb1896022bffbdaa07b63d4 100644 +index 14e31f3fd636ca2ece1df980eeb785fdb2f117a6..9f371e0a61a8b67c0c6d4248a077bb0563b4e99f 100644 --- a/front_end/panels/application/ApplicationPanelSidebar.ts +++ b/front_end/panels/application/ApplicationPanelSidebar.ts @@ -562,6 +562,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe 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 e4b3e429074..aeed1303c20 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,8 +1,8 @@ diff --git a/front_end/panels/network/BUILD.gn b/front_end/panels/network/BUILD.gn -index e1164aae996c84a3db93a539b9a943e7be907aea..2e647a7d30a0ee32ea707b0ced93616c677c54b6 100644 +index fbcc1ad4b6b95d9f579cc10860dea00b85fcfada..6da6002fa71b07b49622881617e9bf1e3144a2c6 100644 --- a/front_end/panels/network/BUILD.gn +++ b/front_end/panels/network/BUILD.gn -@@ -115,6 +115,7 @@ devtools_ui_module("network") { +@@ -116,6 +116,7 @@ devtools_ui_module("network") { "./components:bundle", "./forward:bundle", ] 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 e80a1b12e07..d9cb1f27fea 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 09737d82657b1127df70b8a8081aeab3786532af..633b611c7cf3278935e8b32eedbefa8bfbd71bf8 100644 +index 0a97de431b1f93f2722dbf56c0884820c15ee4a9..b957489b137d1cbcf02811545b5a1ddcece1c781 100644 --- a/front_end/panels/network/NetworkDataGridNode.ts +++ b/front_end/panels/network/NetworkDataGridNode.ts -@@ -1638,6 +1638,7 @@ export class NetworkRequestNode extends NetworkNode { +@@ -1634,6 +1634,7 @@ export class NetworkRequestNode extends NetworkNode { } } 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 fe7119198f7..848a5bee519 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,8 +1,8 @@ diff --git a/front_end/panels/network/NetworkItemView.ts b/front_end/panels/network/NetworkItemView.ts -index 2a39217331b887b09e81497078bfdc4ee175cf05..bc5670aabe271bc66f8dee667a5080486a604949 100644 +index 97c08cce2f7652b8b7044b05cc9b6856426b8cbe..a03d9c3eca6e755cd2a4ae6aefc7974dd01a516d 100644 --- a/front_end/panels/network/NetworkItemView.ts +++ b/front_end/panels/network/NetworkItemView.ts -@@ -430,3 +430,4 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane { +@@ -392,3 +392,4 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane { return this.#headersViewComponent; } } diff --git a/patches/third_party/search_engines_data/resources/definitions-prepopulated_engines.json.patch b/patches/third_party/search_engines_data/resources/definitions-prepopulated_engines.json.patch index fc4a3252eae..ad065ae606f 100644 --- a/patches/third_party/search_engines_data/resources/definitions-prepopulated_engines.json.patch +++ b/patches/third_party/search_engines_data/resources/definitions-prepopulated_engines.json.patch @@ -1,5 +1,5 @@ diff --git a/definitions/prepopulated_engines.json b/definitions/prepopulated_engines.json -index 1b45dd226d87e7a562fce2ffa43969650a2fb602..20e5d75122a90af3642f9cc214f686be10039e64 100644 +index e66563f2f1dadbc409715e9729fe6235db2bb288..2fe8eff887011e94e614ced5c75b582ba9979fef 100644 --- a/definitions/prepopulated_engines.json +++ b/definitions/prepopulated_engines.json @@ -117,25 +117,6 @@ diff --git a/patches/tools-clang-scripts-update.py.patch b/patches/tools-clang-scripts-update.py.patch index dd5f02245f6..ee2eca502c5 100644 --- a/patches/tools-clang-scripts-update.py.patch +++ b/patches/tools-clang-scripts-update.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py -index 14a08340001744cb87453991e5ca57a4cd2a44ea..37e5365fa83d0f980f409618092f74fe985f79ef 100755 +index 31e2b5775021564b7c80b6756020973141c08530..a6e16c9c91db29f707475f568b46e78b6ea0a0a8 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -201,6 +201,8 @@ def DownloadAndUnpack(url, output_dir, path_prefixes=None, is_known_zip=False): diff --git a/patches/tools-crates-gnrt-vendor.rs.patch b/patches/tools-crates-gnrt-vendor.rs.patch index 0148f07c426..28e777b3446 100644 --- a/patches/tools-crates-gnrt-vendor.rs.patch +++ b/patches/tools-crates-gnrt-vendor.rs.patch @@ -1,8 +1,8 @@ diff --git a/tools/crates/gnrt/vendor.rs b/tools/crates/gnrt/vendor.rs -index 2b86c30365644624728013f87612d01bdfec8e8b..06165c8bb59fff73571f7394a9f9ded14dd23643 100644 +index 311b08ce468ddb3e8c893d6267d5e69529ff14ff..4639c83aef0918244b5a99c6728c13b1727bf45a 100644 --- a/tools/crates/gnrt/vendor.rs +++ b/tools/crates/gnrt/vendor.rs -@@ -136,7 +136,7 @@ fn download_crates(args: &VendorCommandArgs, paths: &paths::ChromiumPaths) -> Re +@@ -139,7 +139,7 @@ fn download_crates(args: &VendorCommandArgs, paths: &paths::ChromiumPaths) -> Re format!("Generating placeholder for removed crate {}", crate_dirname.display()); println!("{msg}"); generate_placeholder_crate(p, &crate_path).context(msg)?; diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 72d71c7a3d0..f83e7076e2f 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 5ac909144d0a82914e6f0e89cc885dd8bac05d45..889a51780303d9f46426ee939e273ab734dbdefb 100644 +index bb7dc253bbc1a9e8b194bc55de59bd4e6b7aecc4..f9ba78c483c31c294fe5f73ba0dc1de9dc6dedc2 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -38,6 +38,12 @@ @@ -15,7 +15,7 @@ index 5ac909144d0a82914e6f0e89cc885dd8bac05d45..889a51780303d9f46426ee939e273ab7 "chrome/app/google_chrome_strings.grd": { "messages": [800], }, -@@ -418,7 +424,7 @@ +@@ -426,7 +432,7 @@ "includes": [3900], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/extensions/resources.grd": { @@ -24,7 +24,7 @@ index 5ac909144d0a82914e6f0e89cc885dd8bac05d45..889a51780303d9f46426ee939e273ab7 "includes": [3920], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/extensions_zero_state_promo/resources.grd": { -@@ -462,7 +468,7 @@ +@@ -474,7 +480,7 @@ "includes": [4035], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/history/resources.grd": { @@ -33,7 +33,7 @@ index 5ac909144d0a82914e6f0e89cc885dd8bac05d45..889a51780303d9f46426ee939e273ab7 "includes": [4040], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/infobar_internals/resources.grd": { -@@ -622,7 +628,7 @@ +@@ -630,7 +636,7 @@ "includes": [4720], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/resources.grd": { @@ -42,7 +42,7 @@ index 5ac909144d0a82914e6f0e89cc885dd8bac05d45..889a51780303d9f46426ee939e273ab7 "includes": [4740], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings_shared/resources.grd": { -@@ -650,7 +656,7 @@ +@@ -658,7 +664,7 @@ "includes": [4820], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/customize_chrome/resources.grd": { @@ -51,7 +51,7 @@ index 5ac909144d0a82914e6f0e89cc885dd8bac05d45..889a51780303d9f46426ee939e273ab7 "includes": [4840], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/history/resources.grd": { -@@ -1093,6 +1099,12 @@ +@@ -1105,6 +1111,12 @@ "META": {"join": 2}, "messages": [7020], }, @@ -64,7 +64,7 @@ index 5ac909144d0a82914e6f0e89cc885dd8bac05d45..889a51780303d9f46426ee939e273ab7 "components/components_google_chrome_strings.grd": { "messages": [7020], }, -@@ -1604,11 +1616,11 @@ +@@ -1616,11 +1628,11 @@ "includes": [9980], }, "<(SHARED_INTERMEDIATE_DIR)/ui/webui/resources/webui_code_cache_resources.grd": { diff --git a/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch b/patches/tools-metrics-histograms-metadata-page-histograms.xml.patch index 87d36261550..6e591971b68 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 2e8ac1cd335bd351cd9099387617c9ff34ef6e13..7e0a561a11e63183218ad3a9af81b99acdfaef71 100644 +index 8674bc02bde4161bdbc5e1d5adbeb76e1f558f20..203a184d41b9fe8539e541b794bcf96b3426ad45 100644 --- a/tools/metrics/histograms/metadata/page/histograms.xml +++ b/tools/metrics/histograms/metadata/page/histograms.xml -@@ -519,6 +519,18 @@ chromium-metrics-reviews@google.com. +@@ -544,6 +544,18 @@ chromium-metrics-reviews@google.com. diff --git a/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch b/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch index 9cb73520847..c321e4f4eaa 100644 --- a/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch +++ b/patches/tools-metrics-histograms-metadata-permissions-histograms.xml.patch @@ -1,5 +1,5 @@ diff --git a/tools/metrics/histograms/metadata/permissions/histograms.xml b/tools/metrics/histograms/metadata/permissions/histograms.xml -index 62669632086367232727df45c04c58e7a848f79f..730cf7bb4d44d0beb3e78d10cc5d8c098fa2e24d 100644 +index ea0f1aad03ad4a6cd3112bf849e15f3551dd71fc..ee94fc1d7ab9766bca325d70dd079f799fdf1fa9 100644 --- a/tools/metrics/histograms/metadata/permissions/histograms.xml +++ b/tools/metrics/histograms/metadata/permissions/histograms.xml @@ -53,6 +53,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index 3c39697856a..cdcc9cb913a 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm -index be1577949f307cf0b235788d143df0b3890d5c3c..09e7c8d697651a7e946fd4563fbdffde3e0769d1 100644 +index 21baf2750a134da13eb81ff152ea777d2c6ce639..9120c745be1228e5b9e069d92af88683dd1b611b 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm -@@ -3527,6 +3527,7 @@ const ui::CocoaActionList& GetCocoaActionListForTesting() { +@@ -3538,6 +3538,7 @@ const ui::CocoaActionList& GetCocoaActionListForTesting() { if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index 1b5aa446de6..cbf3727fd6c 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index f4570ade0bc32c45e35b2d1eb11a192f3d78efd9..477cab696fe03332fdc78b28139be3a7d0f675e1 100644 +index 341216ac373f158442803ab13f184535a3a8ead6..c944d286e97d0079997b70332061882a70c110b8 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -502,6 +502,7 @@ component("base") { diff --git a/patches/ui-base-clipboard-clipboard_ozone.cc.patch b/patches/ui-base-clipboard-clipboard_ozone.cc.patch index 221fe7fccbb..a13c64aef5d 100644 --- a/patches/ui-base-clipboard-clipboard_ozone.cc.patch +++ b/patches/ui-base-clipboard-clipboard_ozone.cc.patch @@ -1,5 +1,5 @@ diff --git a/ui/base/clipboard/clipboard_ozone.cc b/ui/base/clipboard/clipboard_ozone.cc -index 0790b559118be4141a1e6a29f281821a63e0c43b..215328a4fc18458bfe12cc9930ef2b85773cf428 100644 +index f28e680c4a9bd5a1c9505d1aaf6a67980a83183e..9496030fee43afe8167d9ed8b25ff87669e3b71f 100644 --- a/ui/base/clipboard/clipboard_ozone.cc +++ b/ui/base/clipboard/clipboard_ozone.cc @@ -197,7 +197,7 @@ class ClipboardOzone::AsyncClipboardOzone { diff --git a/patches/ui-views-view.h.patch b/patches/ui-views-view.h.patch index 51d3eac10e3..8290d952887 100644 --- a/patches/ui-views-view.h.patch +++ b/patches/ui-views-view.h.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/view.h b/ui/views/view.h -index 6e3002f54434f4b09b91e7892fc5e0bf35f8ad9a..d5c715ad03bf309f91d5113b27a36c62530ff0b5 100644 +index 97c8014fadf2231321c05a1f74d91418946bf9fc..acdfcfb7b147b01b5102912091d904441a107a2b 100644 --- a/ui/views/view.h +++ b/ui/views/view.h -@@ -327,6 +327,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, +@@ -325,6 +325,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, FRIEND_TEST_ALL_PREFIXES(WebViewUnitTest, CrashedOverlayView); OwnedByClientPassKey() = default; diff --git a/patches/ui-webui-resources-cr_elements-BUILD.gn.patch b/patches/ui-webui-resources-cr_elements-BUILD.gn.patch index 7095a14ea7d..634a6d6808c 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 db05e637c4b968e403bc3a2ba6b6d61e687a1d8c..e01c9f252006e07964e0d8f129e1f004126eb132 100644 +index 87d5db66bc15e52e4cdeffc15081248d3dac90b2..2dc4799b18bf252f8fc68f552fe293aad460e49a 100644 --- a/ui/webui/resources/cr_elements/BUILD.gn +++ b/ui/webui/resources/cr_elements/BUILD.gn -@@ -245,6 +245,7 @@ build_webui("build") { +@@ -254,6 +254,7 @@ build_webui("build") { "//tools/typescript/definitions/pending.d.ts", "//tools/typescript/definitions/settings_private.d.ts", ] diff --git a/patches/ui-webui-resources-cr_elements-cr_dialog-cr_dialog.ts.patch b/patches/ui-webui-resources-cr_elements-cr_dialog-cr_dialog.ts.patch index a8fd09b8337..0dba5c7e52d 100644 --- a/patches/ui-webui-resources-cr_elements-cr_dialog-cr_dialog.ts.patch +++ b/patches/ui-webui-resources-cr_elements-cr_dialog-cr_dialog.ts.patch @@ -1,8 +1,8 @@ diff --git a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.ts b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.ts -index 0b337de8ed64b75c4d6fd5933bdbd78e739ddc57..ba6f188dd5d24443de2baadc1b921ee59513626d 100644 +index 2fb3122f7fc093f1799137407f48250b7b65a40d..c816d7c9a646458e8798fdd8f946d5d24d7d1268 100644 --- a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.ts +++ b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.ts -@@ -277,7 +277,7 @@ export class CrDialogElement extends CrLitElement { +@@ -281,7 +281,7 @@ export class CrDialogElement extends CrLitElement { const accept = e.target === this || e.composedPath().some( el => (el as HTMLElement).tagName === 'CR-INPUT' && diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index 80fe6049541..07895549e3e 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 15de2179a0e5ce50d5c659a9d15a920c50124c3e..ecc26744d337ffe76e4fa5f1606d3825010032f0 100644 +index a5c7d8477815b437cf5415ab34ca40bb1f43273a..a442346eb24353ee5740d5a775801c94ba0f2f5a 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -864,6 +864,7 @@ config("internal_config_base") { +@@ -876,6 +876,7 @@ config("internal_config_base") { "$target_gen_dir", "$target_gen_dir/include", ] @@ -10,7 +10,7 @@ index 15de2179a0e5ce50d5c659a9d15a920c50124c3e..ecc26744d337ffe76e4fa5f1606d3825 } config("internal_config") { -@@ -3484,6 +3485,7 @@ v8_header_set("v8_headers") { +@@ -3539,6 +3540,7 @@ v8_header_set("v8_headers") { ":v8_tracing", ":v8_version", ] diff --git a/patches/v8/src-codegen-compiler.cc.patch b/patches/v8/src-codegen-compiler.cc.patch index ba09f028fa2..380c3434ee5 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 2dc782458e5f34f17bcc2aff8c99cb7566ce0bb3..0b6072198140f390dfdbc5c9d4a361dfeacd37ad 100644 +index 16d95660587dc7e5ca0558351591f68abec1150d..19b40c074304b06e6dd91d2756ed36d2777d850c 100644 --- a/src/codegen/compiler.cc +++ b/src/codegen/compiler.cc -@@ -3428,6 +3428,7 @@ MaybeDirectHandle Compiler::GetFunctionFromEval( +@@ -3440,6 +3440,7 @@ MaybeDirectHandle Compiler::GetFunctionFromEval( } } CHECK(is_compiled_scope.is_compiled());