Update patches from Chromium 116.0.5845.163 to Chromium 117.0.5938.35.

This commit is contained in:
Claudio DeSouza
2023-09-06 12:38:41 +01:00
parent 614fad311a
commit a3d1b4e292
243 changed files with 509 additions and 509 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 304223b58a7062e3a6ae466d54b9e877708e5cb3..42d684f60658336b564a8754ecf51ec87a17ee27 100644
index 6e6f24e479cce61b5f189faed40601e8f3e82ef9..96b0c277a9a89d28a7862104f9c2b0bb803dfc0e 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4433,6 +4433,7 @@ if (is_android) {
@@ -4396,6 +4396,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java",
"android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java",
]
@@ -1,5 +1,5 @@
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 385b540b5a4291070eff5e1e6a407223de097cdb..76ea6d80e8674c17fd317d35499c48c3df006d6c 100644
index b88010ec63528497fc2ae0b7b3fc04c0fdd2e539..d67d398f23a567c1793edd3b3766832a85100e07 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -731,6 +731,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBaseSyncPrimitives {
@@ -1,8 +1,8 @@
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index da966a58b11be318770fccdd14986efd2a92ccf8..e76a22d0ba534b435313d70cf091c3d7c1cdcf83 100644
index 5d1c694fba219f1f0dbb398d16da7b779dc0afcd..15d9af06c5703999c04d953b9435172e8217e81e 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -190,6 +190,7 @@
@@ -191,6 +191,7 @@
X("webrtc") \
X("webrtc_stats") \
X("xr") \
@@ -1,8 +1,8 @@
diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py
index bc05baf9bbf34e5c0a41eef6198932d4f1ba2afd..95060d77ce502192f7b3e2d63cbce3c20d83a240 100755
index f6dce230f4609e53e55d453bed50e8d6e60d3e96..4fb51148c69fdbbd7a3adbb9637e883cebf92890 100755
--- a/build/android/gradle/generate_gradle.py
+++ b/build/android/gradle/generate_gradle.py
@@ -933,5 +933,6 @@ def main():
@@ -938,5 +938,6 @@ def main():
'+/main/docs/android_studio.md')
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index ce91b38b1ae3bf0be4046b33a3efd5f0ed0f72d1..dfaed65b2cd56d2789ae308d9a794540482138ce 100755
index 221b3fd50c7d02e56f337cacb7174e004ce15d7f..50db6b75db8c8bcfae75137fce46b72c1797f4bc 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -30,6 +30,7 @@ DEFAULT_IGNORE_WARNINGS = (
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
index 20f66723836726987692d898fb56c5368d708867..7b4d5febed77edbee3073178366f63505e0238b3 100755
index c00343ab8d73565a53749be7c113b82621606cd6..424d0889379ccc9abe76b352785429c8aa7f401c 100755
--- a/build/android/gyp/proguard.py
+++ b/build/android/gyp/proguard.py
@@ -316,6 +316,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
@@ -329,6 +329,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
'--pg-map-output',
tmp_mapping_path,
]
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 6ee83a41a05488f016f86f90b026835f4b19ea54..8ad38f54d4333df734b49064673e07eabf2df6dc 100644
index 105e194dd1d4d4003736ce5cf963bc1290de669f..d80df2d4a508a0ee8d81287d7563b109b66d235e 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -329,6 +329,7 @@ is_posix = !is_win && !is_fuchsia
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index 63b37e0c17c678dca03b18b9cbfc3a5b778f208b..a3722c8bad6efbd8233c47b55e535f849acc5e32 100644
index e7c18c068d4e5d401e4128d7f2384bb06e506a30..5f26aed99647932158b4a25a46ae5b03fbccb633 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -39,6 +39,7 @@ config("compiler") {
@@ -1,8 +1,8 @@
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 2be952726980fea7dbe8d8626f12d5a55e1eedb5..0dc3235a1dc66cc1fd00bb85d3d69e7a8a305909 100644
index 0a4ea11f8436ae4bac9c202b81bf24ba959636e9..320c6d0633b113b784d6a51a63a37db01458fd98 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -21,6 +21,7 @@ declare_args() {
@@ -22,6 +22,7 @@ declare_args() {
# toolchain, this GNI file may be read and processed from within Chrome OS
# toolchains. Checking |is_android| here would therefore be too restrictive.
if (is_android || is_chromeos) {
@@ -1,8 +1,8 @@
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 0a8542670b2ea8aedcb4c70c6ffda2f1057b6598..aae574fa58be178ce7e56d2da7aaa7232ef409b4 100644
index d6bcf850168e853cdf70d16362c282256b693868..164c20ff23f2cefafa9e8a91ad1797f30968add1 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -4032,6 +4032,7 @@ if (enable_java_templates) {
@@ -4070,6 +4070,7 @@ if (enable_java_templates) {
} else {
not_needed(invoker, [ "missing_classes_allowlist" ])
}
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index d12617a3c7a3a5b8216b8b7f471d7818ada7f809..de7302a1cef6f6dabeebdd8881540db929d72fe0 100644
index 758dbe2a66cbcbc3164e771059d02c4285db2eb5..c512b39b4e472fa9f12bd5836963418225694d14 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -432,6 +432,7 @@ if (enable_java_templates && is_android) {
@@ -428,6 +428,7 @@ if (enable_java_templates && is_android) {
# ]
# }
template("java_cpp_enum") {
@@ -10,7 +10,7 @@ index d12617a3c7a3a5b8216b8b7f471d7818ada7f809..de7302a1cef6f6dabeebdd8881540db9
action_with_pydeps(target_name) {
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ])
@@ -607,6 +608,7 @@ if (enable_java_templates && is_android) {
@@ -603,6 +604,7 @@ if (enable_java_templates && is_android) {
# output = "$target_gen_dir/AndroidManifest.xml"
# }
template("jinja_template") {
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
index ca7475db78595e5854730d1a68bbdbf2af365df0..2f838a02f399e6f8113d21c82a88b800ea6161a8 100644
index 7471b015c2d66516211a2b36ec77fbcf60854722..c54e8a7baa5c60fb47c8d3e8b5a86a1bdf7b4902 100644
--- a/build/rust/cargo_crate.gni
+++ b/build/rust/cargo_crate.gni
@@ -190,7 +190,7 @@ template("cargo_crate") {
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/rust/run_build_script.py b/build/rust/run_build_script.py
index 3f99f3af9b0b68f600c3f32f49e276eb1308fece..0e30c5367cebf6d63733fd2e7f85f51397c71ce1 100755
index fe8eb107cd720ade5af9bed7e99f817565d23a8c..5617360ca88c936d6d82dca8ae13f469ed85631e 100755
--- a/build/rust/run_build_script.py
+++ b/build/rust/run_build_script.py
@@ -101,11 +101,12 @@ def main():
+6 -6
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 1940c81f4acb9fdaee605abe64adf424bd6e3632..6bc0703fb1d2c7513c64e799c0ebe9f6fa1081de 100644
index 61f07f736047732cc631c713fafa507df48ebb90..d5dd6542ad941a15456274997204eb3697f9e521 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -201,6 +201,7 @@ if (!is_android && !is_mac) {
@@ -77,7 +77,7 @@ index 1940c81f4acb9fdaee605abe64adf424bd6e3632..6bc0703fb1d2c7513c64e799c0ebe9f6
public_deps += [
"//chrome/updater/mac:browser_install_script",
@@ -1277,6 +1285,7 @@ if (is_win) {
@@ -1276,6 +1284,7 @@ if (is_win) {
"-current_version",
chrome_dylib_version,
]
@@ -85,7 +85,7 @@ index 1940c81f4acb9fdaee605abe64adf424bd6e3632..6bc0703fb1d2c7513c64e799c0ebe9f6
if (!is_component_build) {
# Specify a sensible install_name for static builds. The library is
@@ -1457,6 +1466,7 @@ if (is_win) {
@@ -1456,6 +1465,7 @@ if (is_win) {
group("dependencies") {
public_deps = [
@@ -93,7 +93,7 @@ index 1940c81f4acb9fdaee605abe64adf424bd6e3632..6bc0703fb1d2c7513c64e799c0ebe9f6
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//chrome/browser",
@@ -1523,7 +1533,7 @@ group("dependencies") {
@@ -1522,7 +1532,7 @@ group("dependencies") {
if (is_win) {
process_version_rc_template("chrome_exe_version") {
@@ -102,7 +102,7 @@ index 1940c81f4acb9fdaee605abe64adf424bd6e3632..6bc0703fb1d2c7513c64e799c0ebe9f6
output = "$target_gen_dir/chrome_exe_version.rc"
}
@@ -1577,6 +1587,7 @@ group("resources") {
@@ -1576,6 +1586,7 @@ group("resources") {
"//chrome/browser:resources",
"//chrome/common:resources",
"//chrome/renderer:resources",
@@ -110,7 +110,7 @@ index 1940c81f4acb9fdaee605abe64adf424bd6e3632..6bc0703fb1d2c7513c64e799c0ebe9f6
]
}
@@ -1612,6 +1623,7 @@ if (!is_android) {
@@ -1629,6 +1640,7 @@ if (!is_android) {
if (enable_resource_allowlist_generation) {
repack_allowlist = _chrome_resource_allowlist
deps = [ ":resource_allowlist" ]
+7 -7
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 8c74c18eba8a8eca690620af60700aa5dfd0ae9d..6ab64e52574a06b3e07bc27e6dc1f6eebe312f01 100644
index d7ceb4f02120ec22640efc0ab92706c06a110c01..6677ae1444cefaea6beb62fac84e748ee8a48e24 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -169,6 +169,7 @@ if (current_toolchain == default_toolchain) {
@@ -18,7 +18,7 @@ index 8c74c18eba8a8eca690620af60700aa5dfd0ae9d..6ab64e52574a06b3e07bc27e6dc1f6ee
}
android_library("app_hooks_java") {
@@ -629,6 +631,7 @@ if (current_toolchain == default_toolchain) {
@@ -640,6 +642,7 @@ if (current_toolchain == default_toolchain) {
]
deps += feed_deps
@@ -26,7 +26,7 @@ index 8c74c18eba8a8eca690620af60700aa5dfd0ae9d..6ab64e52574a06b3e07bc27e6dc1f6ee
srcjar_deps = [
":chrome_android_java_enums_srcjar",
@@ -649,6 +652,7 @@ if (current_toolchain == default_toolchain) {
@@ -659,6 +662,7 @@ if (current_toolchain == default_toolchain) {
"//components/supervised_user/core/browser:supervised_user_url_filter_enum_javagen",
"//net:effective_connection_type_java",
]
@@ -34,7 +34,7 @@ index 8c74c18eba8a8eca690620af60700aa5dfd0ae9d..6ab64e52574a06b3e07bc27e6dc1f6ee
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -779,6 +783,7 @@ if (current_toolchain == default_toolchain) {
@@ -792,6 +796,7 @@ if (current_toolchain == default_toolchain) {
"//components/messages/android/internal:java",
"//components/segmentation_platform/internal:internal_java",
]
@@ -42,7 +42,7 @@ index 8c74c18eba8a8eca690620af60700aa5dfd0ae9d..6ab64e52574a06b3e07bc27e6dc1f6ee
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -2052,6 +2057,7 @@ if (current_toolchain == default_toolchain) {
@@ -2099,6 +2104,7 @@ if (current_toolchain == default_toolchain) {
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
"java/res_chromium_base/values/channel_constants.xml",
]
@@ -50,7 +50,7 @@ index 8c74c18eba8a8eca690620af60700aa5dfd0ae9d..6ab64e52574a06b3e07bc27e6dc1f6ee
# Dep needed to ensure override works properly.
deps = [ ":chrome_base_module_resources" ]
@@ -2271,6 +2277,7 @@ if (current_toolchain == default_toolchain) {
@@ -2318,6 +2324,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -58,7 +58,7 @@ index 8c74c18eba8a8eca690620af60700aa5dfd0ae9d..6ab64e52574a06b3e07bc27e6dc1f6ee
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
if (webview_includes_weblayer && !_is_bundle_module) {
@@ -2541,6 +2548,7 @@ if (current_toolchain == default_toolchain) {
@@ -2590,6 +2597,7 @@ if (current_toolchain == default_toolchain) {
"//components/payments/content/android:service_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 7e63baa23aa64f0e81263ea1602531d47bbfccf5..f1fc2b2e025cbb54b98f1a9021872d5edd0be4b6 100644
index a67d20641971d0c9618c28c5d9049b4df9b9bb63..ff7acdb33cf8f73825838b67f726f2abae9a73fb 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1204,3 +1204,4 @@ chrome_java_sources = [
@@ -1211,3 +1211,4 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
]
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index 3d760420407464575b056318b80345a5101a3f27..662f9329678793d893172139c8a2364c06f42fab 100644
index 5122a76e6c951f4eec0fdd83437e8c3df1d0856e..e76e2134b26c2ce655f77ce33ef96ccf4da7e6ff 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -313,6 +313,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -314,6 +314,7 @@ template("chrome_common_apk_or_module_tmpl") {
"*ic_file_download_white*", # Bottom edge seems misaligned.
"*ic_lock.*", # Bottom edge seems misaligned.
]
@@ -10,7 +10,7 @@ index 3d760420407464575b056318b80345a5101a3f27..662f9329678793d893172139c8a2364c
# Most of these, with the exception of resource_exclusion_exceptions,
# are currently duplicated in system_webview_apk_tmpl.gni.
@@ -337,6 +338,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -338,6 +339,7 @@ template("chrome_common_apk_or_module_tmpl") {
proguard_enabled = true
proguard_configs = [ "//chrome/android/proguard/main.flags" ]
@@ -18,7 +18,7 @@ index 3d760420407464575b056318b80345a5101a3f27..662f9329678793d893172139c8a2364c
if (_is_monochrome) {
proguard_configs +=
[ "//android_webview/nonembedded/java/proguard.flags" ]
@@ -741,6 +743,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -746,6 +748,7 @@ template("chrome_common_apk_or_module_tmpl") {
"version_code",
"version_name",
])
@@ -26,7 +26,7 @@ index 3d760420407464575b056318b80345a5101a3f27..662f9329678793d893172139c8a2364c
}
}
@@ -769,6 +772,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
@@ -774,6 +777,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
if (!defined(is_monochrome)) {
is_trichrome = true
}
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index b49033acd217fda9cdc7e2a28ad63e56015abcd0..4adc5d5a84a2f3fad4075ed33e21805ec6e7b3dc 100644
index 298dfaabe9ce9c383c2e3b00590ce23e6904d2a7..2d352320951fbd6cd7f2f23b6fa3a33cc6bd0455 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -28,6 +28,7 @@ by a child template that "extends" this file.
@@ -48,7 +48,7 @@ index b49033acd217fda9cdc7e2a28ad63e56015abcd0..4adc5d5a84a2f3fad4075ed33e21805e
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
<uses-permission android:name="android.permission.VIBRATE"/>
@@ -138,7 +149,9 @@ by a child template that "extends" this file.
@@ -136,7 +147,9 @@ by a child template that "extends" this file.
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
@@ -58,7 +58,7 @@ index b49033acd217fda9cdc7e2a28ad63e56015abcd0..4adc5d5a84a2f3fad4075ed33e21805e
{% block extra_uses_permissions %}
{% endblock %}
@@ -200,7 +213,7 @@ by a child template that "extends" this file.
@@ -198,7 +211,7 @@ by a child template that "extends" this file.
android:networkSecurityConfig="@xml/network_security_config"
android:allowAudioPlaybackCapture="false"
android:appComponentFactory="org.chromium.chrome.browser.base.SplitCompatAppComponentFactory"
@@ -67,7 +67,7 @@ index b49033acd217fda9cdc7e2a28ad63e56015abcd0..4adc5d5a84a2f3fad4075ed33e21805e
{% block extra_application_attributes %}{% endblock %}>
{% if channel in ['canary', 'dev', 'default'] %}
@@ -349,6 +362,7 @@ by a child template that "extends" this file.
@@ -347,6 +360,7 @@ by a child template that "extends" this file.
<intent-filter>
<action android:name="com.sec.android.airview.HOVER" />
</intent-filter>
@@ -75,7 +75,7 @@ index b49033acd217fda9cdc7e2a28ad63e56015abcd0..4adc5d5a84a2f3fad4075ed33e21805e
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
@@ -1231,6 +1245,7 @@ by a child template that "extends" this file.
@@ -1218,6 +1232,7 @@ by a child template that "extends" this file.
</activity>
{% endif %}
@@ -1,8 +1,8 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
index 7daa27cc9cfa48fb1cb4314d06c1f2de299fc38b..86567850d549132ceabe511470f765ba1aed2e87 100644
index 587083a0603b65134c5aaed5be2b884b5aca712b..d43358e14e2bc8b51d9e12f374e0d9099e00bd58 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
@@ -42,7 +42,7 @@ class ChromeContextMenuItem {
@@ -41,7 +41,7 @@ class ChromeContextMenuItem {
Item.SHOP_IMAGE_WITH_GOOGLE_LENS, Item.SHARE_IMAGE, Item.DIRECT_SHARE_IMAGE, Item.CALL,
Item.SEND_MESSAGE, Item.ADD_TO_CONTACTS, Item.COPY, Item.SAVE_VIDEO,
Item.OPEN_IN_CHROME, Item.OPEN_IN_NEW_TAB_IN_GROUP, Item.SHARE_HIGHLIGHT,
@@ -11,7 +11,7 @@ index 7daa27cc9cfa48fb1cb4314d06c1f2de299fc38b..86567850d549132ceabe511470f765ba
@Retention(RetentionPolicy.SOURCE)
public @interface Item {
// Values are numerated from 0 and can't have gaps.
@@ -90,7 +90,7 @@ class ChromeContextMenuItem {
@@ -89,7 +89,7 @@ class ChromeContextMenuItem {
int REMOVE_HIGHLIGHT = 33;
int LEARN_MORE = 34;
// ALWAYS UPDATE!
@@ -20,7 +20,7 @@ index 7daa27cc9cfa48fb1cb4314d06c1f2de299fc38b..86567850d549132ceabe511470f765ba
}
/**
@@ -132,6 +132,7 @@ class ChromeContextMenuItem {
@@ -131,6 +131,7 @@ class ChromeContextMenuItem {
R.id.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT
R.id.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT
R.id.contextmenu_learn_more, // Item.LEARN_MORE
@@ -28,7 +28,7 @@ index 7daa27cc9cfa48fb1cb4314d06c1f2de299fc38b..86567850d549132ceabe511470f765ba
};
/**
@@ -173,6 +174,7 @@ class ChromeContextMenuItem {
@@ -172,6 +173,7 @@ class ChromeContextMenuItem {
R.string.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT
R.string.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT
R.string.contextmenu_learn_more, // Item.LEARN_MORE
@@ -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 82360f40547faca5e3e0a820ccadbbbc8e26c04a..59fd1aad787a5fb0c2bffe6ead049465a82abc34 100644
index f46b319c4fc0efb162ba364da6929df1e5026888..238b81bff6b18669c2ba7419f19bb3ae16f34f84 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
@@ -132,7 +132,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -131,7 +131,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
Action.COPY_IMAGE, Action.SHOP_IMAGE_WITH_GOOGLE_LENS, Action.READ_LATER,
Action.SHOP_WITH_GOOGLE_LENS_CHIP, Action.TRANSLATE_WITH_GOOGLE_LENS_CHIP,
Action.SHARE_HIGHLIGHT, Action.REMOVE_HIGHLIGHT, Action.LEARN_MORE,
@@ -11,7 +11,7 @@ index 82360f40547faca5e3e0a820ccadbbbc8e26c04a..59fd1aad787a5fb0c2bffe6ead049465
@Retention(RetentionPolicy.SOURCE)
public @interface Action {
int OPEN_IN_NEW_TAB = 0;
@@ -176,7 +176,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -175,7 +175,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
int LEARN_MORE = 38;
int OPEN_IN_NEW_TAB_IN_GROUP = 39;
int OPEN_IN_NEW_WINDOW = 40;
@@ -20,7 +20,7 @@ index 82360f40547faca5e3e0a820ccadbbbc8e26c04a..59fd1aad787a5fb0c2bffe6ead049465
}
}
@@ -269,6 +269,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -259,6 +259,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
if (!MailTo.isMailTo(mParams.getLinkUrl().getSpec())
&& !UrlUtilities.isTelScheme(mParams.getLinkUrl())) {
linkGroup.add(createListItem(Item.COPY_LINK_ADDRESS));
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
index 4d7ba2bfa18a741358dcc2b2171971700f04e159..b74610ae583c66d0b0f0419f05ef6be588c24adc 100644
index f592872e177033b9a09fdcff19aeeaea66c2ec23..aba68dd18f3eb0c3d7216e430dcd3182a98a8703 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
@@ -82,7 +82,7 @@ public class NotificationPlatformBridge {
@@ -11,7 +11,7 @@ index 4d7ba2bfa18a741358dcc2b2171971700f04e159..b74610ae583c66d0b0f0419f05ef6be5
private static NotificationManagerProxy sNotificationManagerOverride;
@@ -135,7 +135,7 @@ public class NotificationPlatformBridge {
@@ -133,7 +133,7 @@ public class NotificationPlatformBridge {
sNotificationManagerOverride = notificationManager;
}
@@ -20,7 +20,7 @@ index 4d7ba2bfa18a741358dcc2b2171971700f04e159..b74610ae583c66d0b0f0419f05ef6be5
mNativeNotificationPlatformBridge = nativeNotificationPlatformBridge;
Context context = ContextUtils.getApplicationContext();
if (sNotificationManagerOverride != null) {
@@ -585,7 +585,7 @@ public class NotificationPlatformBridge {
@@ -583,7 +583,7 @@ public class NotificationPlatformBridge {
}
}
@@ -1,5 +1,5 @@
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 436209985756ef3c0ccecc56ea4a75f011f337ba..8ca92d3628f383d90291cbddd2dd07dcfbe662d0 100644
index 242926889212725eabff3db27caa8bb4827f7421..9186f3601f548b7288c1e3ec1e4b54f6902be07c 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
@@ -60,7 +60,7 @@ import org.chromium.ui.text.SpanApplier;
@@ -11,7 +11,7 @@ index 436209985756ef3c0ccecc56ea4a75f011f337ba..8ca92d3628f383d90291cbddd2dd07dc
implements Preference.OnPreferenceChangeListener, FragmentHelpAndFeedbackLauncher,
ProfileDependentSetting {
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
@@ -337,6 +337,7 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -333,6 +333,7 @@ public class PrivacySettings extends PreferenceFragmentCompat
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
@@ -19,7 +19,7 @@ index 436209985756ef3c0ccecc56ea4a75f011f337ba..8ca92d3628f383d90291cbddd2dd07dc
MenuItem help =
menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
help.setIcon(TraceEventVectorDrawableCompat.create(
@@ -350,7 +351,7 @@ public class PrivacySettings extends PreferenceFragmentCompat
@@ -346,7 +347,7 @@ public class PrivacySettings extends PreferenceFragmentCompat
getActivity(), getString(R.string.help_context_privacy), null);
return true;
}
@@ -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 ea1d9e280b7fbcc6dee43b5b719cbcba85773dae..0e43bdf14d2f60e00973d8bb07c66451f5b97d05 100644
index 3ffd30c3b7c2d2142fc5dcd9941a7b6e33be90ef..d566e0eda8ee997458661f9240a0e9d8e5a6c0e7 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
@@ -53,7 +53,7 @@ import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
@@ -52,7 +52,7 @@ import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment;
import org.chromium.chrome.browser.ui.signin.SignOutDialogCoordinator;
import org.chromium.chrome.browser.ui.signin.SignOutDialogCoordinator.Listener;
@@ -11,7 +11,7 @@ index ea1d9e280b7fbcc6dee43b5b719cbcba85773dae..0e43bdf14d2f60e00973d8bb07c66451
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.SettingsUtils;
import org.chromium.components.signin.AccountManagerFacadeProvider;
@@ -359,7 +359,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
@@ -353,7 +353,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
.getIdentityManager(Profile.getLastUsedRegularProfile())
.getPrimaryAccountInfo(ConsentLevel.SYNC));
// May happen if account is removed from the device while this screen is shown.
@@ -1,8 +1,8 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
index 25e2ad32e692811742be261cd873dfff4bc64130..e724b0680df3e95f71fe366dc5745baaae49e5f6 100644
index 7f494b05c003ff94d51b1fbb1f8e799b717c0611..db9bef6484953024b31ea14c164665857dab1564 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -705,7 +705,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -702,7 +702,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
NotificationPermissionController.attach(
mWindowAndroid, mNotificationPermissionController);
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index d7531ca3e7b29ad67ce5e8f893f02b7a11d58191..9db19f0addf6a72c5aac59bdc01366b55a04c1c9 100644
index 8179dd92317a4cbafb65bdefd5c27f9848bca0d7..411ad5c908ceb4aac150a5ac1844d288057c71f2 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -124,6 +124,8 @@ grit("generated_resources") {
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 07f0f0f97e0dc608513e7f532746f0f9a78e6a94..2209f0264d1a8634ce07f783e39c79ed7e432780 100644
index ff490f2ffb3f5af65d8af96ff708f9292ffb5e33..949a451d9369766c0c56fb4985f2ee2f632b52af 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2568,6 +2568,7 @@ static_library("browser") {
@@ -2587,6 +2587,7 @@ static_library("browser") {
"metrics/family_link_user_metrics_provider.h",
]
}
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 20160807af8efefcabc065c89b18c7e9685974ee..c3d4d3ebddcbf27a459ecfeedd698e9a68ae85ae 100644
index 6dd44c495824833aecddbb76582836ffb7c5a593..1106dbc7e077f424635d0f0229f89cda7a53cc30 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3788,6 +3788,7 @@ const FeatureEntry::FeatureVariation kPasswordGenerationExperimentVariations[] =
@@ -3819,6 +3819,7 @@ const FeatureEntry::FeatureVariation kPasswordGenerationExperimentVariations[] =
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index e36b5a4d6d8d093bc1f13c3df3cb404562149617..9c1d11b98fbd3d748fb7db22a6711f1a77cd73b6 100644
index 32b5fd746c0e300638010e03282cfc97ff9260ac..d45f86bddb9a9222f5e24869459be8b6e9d1a4db 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -646,7 +646,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
@@ -644,7 +644,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
+ (AppController*)sharedController {
static AppController* sharedController = [] {
@@ -11,7 +11,7 @@ index e36b5a4d6d8d093bc1f13c3df3cb404562149617..9c1d11b98fbd3d748fb7db22a6711f1a
NSApp.delegate = sharedController;
return sharedController;
}();
@@ -1187,7 +1187,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
@@ -1183,7 +1183,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
}
auto it = _profileBookmarkMenuBridgeMap.find(profilePath);
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 701b6cc46045cadb381e4399acca782422c21d5f..00b0e73433741b51a7c99745dcccc10d25fdc865 100644
index 43d7af86dbd67cccb6a9dffdc3e1c2a2e69130f5..68fe495b2e11dba1a95a12ec779ca32985237fff 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -223,6 +223,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -225,6 +225,7 @@ class BrowserProcessImpl : public BrowserProcess,
static void RegisterPrefs(PrefRegistrySimple* registry);
private:
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index d2a62ef6ea76f1ada7b619bd2a18c5d004b81fe4..6fd1361174a5aab96fae5cf4f13a407b6e156851 100644
index 21df89b758b87ceb35802f284337e801a7a50ca3..f6b271eacbef3a69315c0d7d78d01cdbc148c1ae 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -93,6 +93,7 @@ class ChromeBrowsingDataRemoverDelegate
@@ -95,6 +95,7 @@ class ChromeBrowsingDataRemoverDelegate
void OverrideDomainReliabilityClearerForTesting(
DomainReliabilityClearer clearer);
@@ -10,7 +10,7 @@ index d2a62ef6ea76f1ada7b619bd2a18c5d004b81fe4..6fd1361174a5aab96fae5cf4f13a407b
private:
using WebRtcEventLogManager = webrtc_event_logging::WebRtcEventLogManager;
@@ -147,11 +148,12 @@ class ChromeBrowsingDataRemoverDelegate
@@ -149,11 +150,12 @@ class ChromeBrowsingDataRemoverDelegate
kWebAuthnCredentials = 43,
kWebrtcVideoPerfHistory = 44,
kMediaDeviceSalts = 45,
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
index a1ba301df353a21861bba1e8d2ed8d8b74333da0..21ffa49038e6dbfd03072318891b31d939b5ea96 100644
index 329adc1de429b7fc7cb8479244a472768e7d7890..4d9dc70ac6c6472acea78b8e192ca9d88c76c331 100644
--- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
+++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
@@ -129,6 +129,7 @@ void GetGuestViewDefaultContentSettingRules(
@@ -170,6 +170,7 @@ void GetGuestViewDefaultContentSettingRules(
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK),
std::string(), incognito));
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
index 4a297b7842a70f90d9f335291f58e7ac04cf0f4a..36a1b86ee8d6c6b75a4ccf0d6697ba0a059935f3 100644
index 4aa1c174727044c92f8bf772c49c17d162d4dc25..d02a39cf83cd6e421f0642b981f10b4b6b4688dc 100644
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1256,6 +1256,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 51ffd40dbf0a0bcdb0d39b4f717c0eafb856f9c7..a488bd8e03e8b33864bbfceddec467e472e16382 100644
index 913a49367abcca1523a782d248a454166b984f97..e545ac85598e11b195c9409d05641b1e5c30cc0e 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1397,6 +1397,7 @@ static_library("extensions") {
@@ -1402,6 +1402,7 @@ static_library("extensions") {
} else {
sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
}
@@ -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 218ffaaa0d8b7aab670b31491aa084735e53ccde..93ea674b2cba67558e4d2df7b2adc2b747b5db1f 100644
index ad388123c6548a639b7efa35e8404dda53915684..2ac0a421f379938208020893ec63edcc0d1aec4d 100644
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -641,6 +641,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
@@ -643,6 +643,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension);
info->incognito_access.is_active =
util::IsIncognitoEnabled(extension.id(), browser_context_);
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
index 87dc7d1caae87df92225a74c8a0ca5f187c21c32..940345f806e3bf7c4b57646c8e2221f41e883c70 100644
index 0447095518189c3e27ba372e40a06c2f5e34969e..5d1843efd03b974e11fcf33804d818b0194c6673 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
@@ -170,6 +170,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() {
@@ -171,6 +171,7 @@ ExtensionFunction::ResponseAction IdentityGetAuthTokenFunction::Run() {
// From here on out, results must be returned asynchronously.
StartAsyncRun();
@@ -10,7 +10,7 @@ index 87dc7d1caae87df92225a74c8a0ca5f187c21c32..940345f806e3bf7c4b57646c8e2221f4
if (gaia_id.empty() || IsPrimaryAccountOnly()) {
// Try the primary account.
// TODO(https://crbug.com/932400): collapse the asynchronicity
@@ -393,10 +394,12 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() {
@@ -394,10 +395,12 @@ void IdentityGetAuthTokenFunction::StartSigninFlow() {
void IdentityGetAuthTokenFunction::StartMintTokenFlow(
IdentityMintRequestQueue::MintType type) {
#if !BUILDFLAG(IS_CHROMEOS)
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
index be222f2e653148a7cd28c2c353cd6137f2855555..21589a3af5f4f7c270a831cea0eed9d330e09c78 100644
index b82191200961c5cadc81dca83b0600cea1072bc6..5d15920b6bce55f771b493927cfb87f865a171ce 100644
--- a/chrome/browser/flags/BUILD.gn
+++ b/chrome/browser/flags/BUILD.gn
@@ -34,6 +34,7 @@ android_library("java") {
@@ -33,6 +33,7 @@ android_library("java") {
"//third_party/android_deps:guava_android_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm
index 268856f9d89b83b9815e0ec5522d0060e1e9538c..8d6a11fe555734b2d4fb60664050a4ada00a5f8b 100644
index 6c62ab97045c8db9666fe68096ebc7f216680435..c60c0ec280575dd21e8c1eff71226780218145e9 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac.mm
+++ b/chrome/browser/global_keyboard_shortcuts_mac.mm
@@ -153,6 +153,7 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() {
@@ -149,6 +149,7 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() {
{true, false, false, true, kVK_DownArrow, IDC_FOCUS_NEXT_PANE},
{true, false, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE},
{true, true, false, true, kVK_ANSI_A, IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY},
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/incognito/BUILD.gn b/chrome/browser/incognito/BUILD.gn
index eccefc91c69b95f6401baec6c092ed1289fd2533..9a1b28337d36275a8cc0fdb1781b13b906a0b302 100644
index b6c611172ac34551196ae8b647eb06773340aece..47d105e70e1cc3b32d8f3ce49de215dcb6073539 100644
--- a/chrome/browser/incognito/BUILD.gn
+++ b/chrome/browser/incognito/BUILD.gn
@@ -62,6 +62,7 @@ android_library("java") {
@@ -63,6 +63,7 @@ android_library("java") {
"//url:gurl_java",
]
@@ -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 2795ff21d23b819dde4a324d522e0a954955860a..ac7d5321322decb65a48ca5e7334a911153c8797 100644
index e45e4487be0a3f2137bae0f4b96980507e4f4204..342c16d67e8f1cffde4e8dfca7146061bfbb3a96 100644
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -491,6 +491,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
@@ -515,6 +515,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
std::vector<std::string> excluded_legacy_spkis(
TranslateStringArray(ct_excluded_legacy_spkis));
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc
index 6dc5622f50847e35d66eff8b34b4888aa6c4ca90..198d824d63659e32aa6e1ebe630e58ae5de7a74c 100644
index c9281f7abfbdeaa4f0d9fe3c199b34fcb5acaf2c..4bd06d22bad8f82a1733eda4b20d290ba498bbe1 100644
--- a/chrome/browser/net/proxy_config_monitor.cc
+++ b/chrome/browser/net/proxy_config_monitor.cc
@@ -53,6 +53,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
@@ -52,6 +52,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
profile->GetPrefs(), g_browser_process->local_state());
}
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
index 35ad09af3e071c9d0a05d0ae967e4ee04cfe2f07..d0967a2a4b2e18cc5cefc9c39b9d5227e7586fbe 100644
index 0f33b0c21ece0a13c746c4a12eb55a875d87ebe5..a68cdc51f3da332cd3ea53ff5a7cafd0f6ee358c 100644
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -298,7 +298,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
@@ -347,7 +347,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
if (!manager_)
return;
manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn
index 9f8f270d738559ca91a892988a5c4a39fe3b5778..c4b5dc98f3ce03c797b57694149b86e8ac5268c7 100644
index 249433c797fde787e52689f1a9b8dc672a4bcbbe..2f4d62ac0ad3df6ccacecdd8e6ecdf8766411b61 100644
--- a/chrome/browser/notifications/BUILD.gn
+++ b/chrome/browser/notifications/BUILD.gn
@@ -82,6 +82,7 @@ if (is_android) {
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
index e0257b2da7ce00206e541cbe3e6092b3861fa775..d039e0c52fcb39ef0d7e8b15c57eeb66036d28ed 100644
index d15a889535f7c1679dad73cf382c62f2d6250af3..224e69136cfeef8235e963717bcd90b539eec645 100644
--- a/chrome/browser/preferences/BUILD.gn
+++ b/chrome/browser/preferences/BUILD.gn
@@ -29,6 +29,7 @@ android_library("java") {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2fc5abfb9e9f0782b5ac03095c03a836d37c0376..ea935c7a76413daf835fd6642b7c8c877488b848 100644
index 1944adea64d4cd10e6d70f69f3ad193b524669e0..9d21d29b3b9d342ca603efb38d7983b893da7f62 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1612,6 +1612,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1626,6 +1626,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -11,7 +11,7 @@ index 2fc5abfb9e9f0782b5ac03095c03a836d37c0376..ea935c7a76413daf835fd6642b7c8c87
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
screen_ai::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
@@ -2021,6 +2023,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2036,6 +2038,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterBooleanPref(kClearUserDataDir1Pref, false);
#endif
@@ -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 7f04636806afe3225aebb2e2e8ac6ca31089720e..b2338be312fbbd1a3a7ac27498924ca70d9f6890 100644
index 9e9372e1b3b7fb80c7cc218a817dc9eedcd52ef5..1ec1d9d958d35bb512115a9e1b5e5f7bcd336c1c 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -2117,6 +2117,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -2136,6 +2136,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
selection_navigation_url_ = match.destination_url;
if (!selection_navigation_url_.is_valid())
return;
@@ -1,8 +1,8 @@
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 0cbc7b7181130e21d393825c5440ae4112456ccf..46266026cbfcfbccc5c75e81f84837d2837ccd37 100644
index 88034ab23482766ea9483cc0e9a92e0742d48832..8af532121329c9e93f6fd04b0be6c02ef6846486 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -185,6 +185,7 @@ class RenderViewContextMenu
@@ -191,6 +191,7 @@ class RenderViewContextMenu
// Returns true if keyboard lock is active and requires the user to press and
// hold escape to exit exclusive access mode.
bool IsPressAndHoldEscRequiredToExitFullscreen() const;
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/extensions/item_list.html b/chrome/browser/resources/extensions/item_list.html
index 49a48fa68bad67c2f756d895867745e9413179c2..3b106c2d2604653e881a108f07cc55567a6f2233 100644
index 807d3076ee961265bd6b80796d2596fd25a35361..d017c312c519a325566b8b2d0ccea2a620e01eff 100644
--- a/chrome/browser/resources/extensions/item_list.html
+++ b/chrome/browser/resources/extensions/item_list.html
@@ -129,5 +129,6 @@
@@ -147,5 +147,6 @@
</template>
</div>
</div>
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts
index c50ddec2b618afe0f5e13403b5180f6a584a5305..306a7891c6811331ad6e919c8e072eb0e2484541 100644
index 6d6862a0ef20c8b88d3f1d0055bfb7df0d41c4c1..6792e05cbec9985f5b1f5c30dd1fc064d1fe2fd2 100644
--- a/chrome/browser/resources/extensions/item_list.ts
+++ b/chrome/browser/resources/extensions/item_list.ts
@@ -14,6 +14,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/extensions/sidebar.html b/chrome/browser/resources/extensions/sidebar.html
index 4d193d9683b18092f21673bfd92eb07c06eb4b01..d151d2d53d74c51a986364bae3d7dc95865f27b1 100644
index 103812bf71f80ee9acf18cca78adece8b7f87c0b..8fd83fc0cd43622a4d0a1929043e49b2dd83ce7f 100644
--- a/chrome/browser/resources/extensions/sidebar.html
+++ b/chrome/browser/resources/extensions/sidebar.html
@@ -71,6 +71,7 @@
@@ -72,6 +72,7 @@
</a>
</iron-selector>
<div>
@@ -10,7 +10,7 @@ index 4d193d9683b18092f21673bfd92eb07c06eb4b01..d151d2d53d74c51a986364bae3d7dc95
<div class="separator"></div>
<div class="cr-nav-menu-item" id="moreExtensions">
<iron-icon id="web-store-icon" icon="extensions-icons:web_store">
@@ -81,3 +82,4 @@
@@ -82,3 +83,4 @@
<paper-ripple></paper-ripple>
</div>
</div>
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
index d86fe848aded1075c0285fa1dadda0aab7af7c23..f59c7339b4a4761e04638bb55e334f00c108ed1e 100644
index e37a0086c59da1c03f3ad0339add090a597b8ec7..445ba9768978e637627dc93d90871f6ede127eee 100644
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -450,4 +450,5 @@ build_webui("build") {
@@ -437,4 +437,5 @@ build_webui("build") {
"$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
root_build_dir) ]
}
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts
index 82390e59a178d861873c2b969bcf2a4d7345df40..c3392ddbe48991405579fd44ad1df0163a8edc0c 100644
index d9cecedc93ded3eecb1913c81710ed4470b94209..a0bbf205aee9291f6f9b34a451091420b38a1d9a 100644
--- a/chrome/browser/resources/settings/people_page/sync_controls.ts
+++ b/chrome/browser/resources/settings/people_page/sync_controls.ts
@@ -118,7 +118,7 @@ export class SettingsSyncControlsElement extends
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
index 7be2ad2e49fe5544c8534f3f108f1ec8752e7b5d..60130b6f217597ee3a7cc8608dac63bff82c1ae7 100644
index 4fd564ebb19be9fdb8f545a21e5fe1492313dc0c..d9572759a91d65a09a93dd43f804c1d01b8f6844 100644
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -71,7 +71,7 @@ export class SettingsPersonalizationOptionsElement extends
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 7f6f1a5382aff11bf9f1578890402954a98c4826..aa946bb3fa3f7a96fc99e65958a875e7d607b9b8 100644
index d1c96ab670f42622b85b0f6aa36091a7cbf968bc..a570cb04efcf88666e9c6e236bda9798fbcade66 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -34,6 +34,7 @@
@@ -10,7 +10,7 @@ index 7f6f1a5382aff11bf9f1578890402954a98c4826..aa946bb3fa3f7a96fc99e65958a875e7
<cr-link-row id="clearBrowsingData"
start-icon="cr:delete"
label="$i18n{clearBrowsingData}"
@@ -242,6 +243,7 @@
@@ -244,6 +245,7 @@
</category-setting-exceptions>
</settings-subpage>
</template>
@@ -18,7 +18,7 @@ index 7f6f1a5382aff11bf9f1578890402954a98c4826..aa946bb3fa3f7a96fc99e65958a875e7
<template is="dom-if" route-path="/content/backgroundSync" no-search>
<settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
search-label="$i18n{siteSettingsAllSitesSearch}"
@@ -269,6 +271,7 @@
@@ -271,6 +273,7 @@
</category-setting-exceptions>
</settings-subpage>
</template>
@@ -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 ea117e5584e2f8e6d0ca46b63fe1b980e58d8d79..d52020e45a4aa72a230adb5eac34b2533df6bf29 100644
index 76c7d5d0170355daab2a4546da607bf8201af4eb..f7995ceef9a04b10a02f38af07b530d4b815ed4b 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -18,6 +18,7 @@ import '../settings_page/settings_animated_pages.js';
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
index bc580a9b37080f6468807dc8b2599881671f8d30..0b2afdacaba6ae413c6746e5b3effcb9c636d198 100644
index f0b4905379d30a14a937b2212c1d2caa8ef50704..114423bb60359171053c1a94e1bc4660e3bd4ae3 100644
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -8,6 +8,7 @@ import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
@@ -10,7 +10,7 @@ index bc580a9b37080f6468807dc8b2599881671f8d30..0b2afdacaba6ae413c6746e5b3effcb9
/**
* Add all of the child routes that originate from the privacy route,
* regardless of whether the privacy section under basic or advanced.
@@ -288,6 +289,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
@@ -278,6 +279,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
}
// </if>
}
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
index f8b2a426544a1b985fe2e00735fdd8e66458d3ab..bf1178d021516caad6d36cdd6c968eacb23f311e 100644
index 18d787f7f1a13b7a903021598c442a5147f19cc1..38d83dde5ee1f7b8f783f34994aaf61fc91400fb 100644
--- a/chrome/browser/resources/settings/router.ts
+++ b/chrome/browser/resources/settings/router.ts
@@ -105,6 +105,7 @@ export interface SettingsRoutes {
@@ -101,6 +101,7 @@ export interface SettingsRoutes {
SYNC_ADVANCED: Route;
SYSTEM: Route;
TRIGGERED_RESET_DIALOG: Route;
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
index 3e1e355377ed6eeaab3315050ac4ff6c4fd20403..612f17c08f48a043786c0936d313dbe55189f5ed 100644
index d8783de1b83335f8dd295e1f53d3c4752a531a5c..ecb90e239e9727a2c0c3ca8585c4ebfe0ea2ea03 100644
--- a/chrome/browser/resources/settings/settings.ts
+++ b/chrome/browser/resources/settings/settings.ts
@@ -2,6 +2,7 @@
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts
index ef3a8845cf320aafa20be168eca4d0f970199119..52d94449126d28f6aa4be753aa61194bb8419879 100644
index 42a580a7eed0f49fc7251ef867c721a04a37d0bf..00331b98d9bd28c9ab11373b52edc4bd2a35d742 100644
--- a/chrome/browser/resources/settings/site_settings/constants.ts
+++ b/chrome/browser/resources/settings/site_settings/constants.ts
@@ -52,6 +52,7 @@ export enum ContentSettingsTypes {
@@ -53,6 +53,7 @@ export enum ContentSettingsTypes {
// are used everywhere where ContentSettingsTypes is used in JS.
PDF_DOCUMENTS = 'pdfDocuments',
SITE_DATA = 'site-data',
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
index eddbe04e23c927a69a637a7549c87c33cd582b75..daf2ebfb75402ebff103c09201d95ffcc7aa2849 100644
index e06784e40d55666b75bb3e4207ce55366cb9c84b..415f8966d3175fa012728855719b89d5d831d175 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -8,6 +8,7 @@
@@ -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 b2dfcf36935bf11bb0eaf8b4f00588a37fee488a..fc3b731acb03b7fc07f74f2dbd2956e7d7deafb2 100644
index bc867180d9429702b7613a3c2f7789949c936ea1..0e418fcf8b5782f81733f89b8433fe47815b2068 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
@@ -296,6 +296,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
@@ -290,6 +290,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
std::unique_ptr<ClientDownloadRequest> request) {
client_download_request_ = std::move(request);
SanitizeRequest();
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
index a7853cc014069560f3f21077243599d32364a4e5..5fd431fd299fbf8f8ab86c590854885c6f325f05 100644
index c495783de021a0984e30edaef6227cdcbf783839..2704a2d7b09f5b2f6845deb080fc014f2c0df2ab 100644
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
@@ -185,6 +185,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
index 4d6fd63391bfdc8410a99c28e1c5fe752750ebb7..1ff9a9c392a16596645ae8007a95fe8c3fef28aa 100644
index b86e3e287da427eb01465fba438e5c54a0e49799..5444ccfdc3c8e9f72cb88ef735f326c83ecf8608 100644
--- a/chrome/browser/sync/sync_service_factory.cc
+++ b/chrome/browser/sync/sync_service_factory.cc
@@ -165,7 +165,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
@@ -170,7 +170,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
}
auto sync_service =
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
index ebf39789109595eb74c7b1f10f2e9d01f4c0b01a..f97aa7deeacf9bbaa2bd84306d9686b532fe57b5 100644
index 879bbeef4037b9292e6a563ee9deb3c73dabc247..5c149fce515c27f0177ec1c1bcb36451c950cdb7 100644
--- a/chrome/browser/themes/theme_service_factory.cc
+++ b/chrome/browser/themes/theme_service_factory.cc
@@ -102,6 +102,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
@@ -103,6 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index d7bb16c28835bbfdf1d095ed743f621af5e2613f..5842a7e8588802604cec5b89215c136fbe9c5ce0 100644
index cc4fbda7ddfa830909de196359217c82182331de..f725e33eb318d880b6001d64396151b77fc2ebf0 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -787,6 +787,7 @@ static_library("ui") {
@@ -694,6 +694,7 @@ static_library("ui") {
"//chrome/browser/profiling_host",
"//chrome/browser/ui/webui:configs",
]
@@ -10,7 +10,7 @@ index d7bb16c28835bbfdf1d095ed743f621af5e2613f..5842a7e8588802604cec5b89215c136f
if (enable_vr && is_win) {
deps += [ "//chrome/browser/vr:vr_base" ]
@@ -4257,10 +4258,13 @@ static_library("ui") {
@@ -4296,10 +4297,13 @@ static_library("ui") {
]
deps += [ "//chrome/updater/app/server/win:updater_legacy_idl_idl" ]
} else {
@@ -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 9a6496a110a8b5c8fc0eb7792eae158f1b87c8d5..814e8196b35bc45fa2e0f62a8822559e2ecf3ced 100644
index 950d1b91a63ffb5d809b463e71e3a0bc3598b3a7..0ec2d6076f7de292cae054ab3ee8007cad48d464 100644
--- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn
+++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
@@ -21,6 +21,7 @@ android_library("java") {
@@ -1,5 +1,5 @@
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 726e0f37df49b810365464eb41315cc5bf1cea5c..177b7f3dc52d44ac461d595ecdb6d5bef2754ea2 100644
index 270267ef3fdd1680666fb757341b4b28e9bcd88b..c129c8542b7a3fe0251faf79702ed960e1c8a92e 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
@@ -219,6 +219,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
index 605b0ecb320195780296f59e28ec0a74707b4a91..0a969a3eccf60fdcd657832d22276b70db936bc2 100644
index 74a50a599c2a5af1508e449a67be91adc7b865e1..3bc269d5c78fc376e9a557855e056f2b84548ea4 100644
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -116,6 +116,7 @@ android_library("java") {
@@ -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 9552479e7b8ed48d3ba3270b5e331160c14fa3ae..8bd4efb83f5b960f65f5bc1bf1e8732d6c76999a 100644
index a8da4613ffecb0084870a6399a265de2ec7323ac..2563251f0b56941deb65d811ece74d75bdf49284 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
@@ -389,6 +389,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -397,6 +397,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
if (mOptionalButtonCoordinator != null) {
mOptionalButtonCoordinator.setBackgroundColorFilter(color);
}
@@ -10,7 +10,7 @@ index 9552479e7b8ed48d3ba3270b5e331160c14fa3ae..8bd4efb83f5b960f65f5bc1bf1e8732d
}
private void updateModernLocationBarCorners() {
@@ -560,6 +561,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -568,6 +569,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
}
}
@@ -18,7 +18,7 @@ index 9552479e7b8ed48d3ba3270b5e331160c14fa3ae..8bd4efb83f5b960f65f5bc1bf1e8732d
}
@Override
@@ -1011,6 +1013,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -1019,6 +1021,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
* New Tab Page.
*/
private void updateLocationBarLayoutForExpansionAnimation() {
@@ -26,7 +26,7 @@ index 9552479e7b8ed48d3ba3270b5e331160c14fa3ae..8bd4efb83f5b960f65f5bc1bf1e8732d
TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
if (isInTabSwitcherMode()) return;
@@ -1333,6 +1336,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -1358,6 +1361,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
canvas.restore();
}
@@ -34,7 +34,7 @@ index 9552479e7b8ed48d3ba3270b5e331160c14fa3ae..8bd4efb83f5b960f65f5bc1bf1e8732d
// Draw the tab stack button and associated text if necessary.
if (mTabSwitcherAnimationTabStackDrawable != null && mToggleTabStackButton != null
&& mUrlExpansionFraction != 1f) {
@@ -2086,6 +2090,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -2111,6 +2115,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
} else {
populateUrlClearExpansionAnimatorSet(animators);
}
@@ -1,5 +1,5 @@
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 ac497a8f2ce78152f3d5cab8df2d1961ec357545..28c2d06786a6b3475df6f79d1d76477f52aa9354 100644
index ba62ac8e2b7e70109d30cf45a78d819af708d025..739bf1be65effc4c8660a1e6a94cb93d671fcd5f 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
@@ -375,10 +375,12 @@ public class ToolbarTablet
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 9125b6d7e3e8771458eaa1675bf0dac8f53f7be2..7f8f6c43ba5d00d50193f62f3c92c2004e13b364 100644
index c5aefe534dcd1a26cb9faef723e832b95b27eca4..a29ed9ca173f303cdee0456c049d77a8a8ff07d4 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -452,6 +452,7 @@ Browser* Browser::Create(const CreateParams& params) {
@@ -446,6 +446,7 @@ Browser* Browser::Create(const CreateParams& params) {
// not possible, e.g. using the wrong profile or during shutdown. The caller
// should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
@@ -10,7 +10,7 @@ index 9125b6d7e3e8771458eaa1675bf0dac8f53f7be2..7f8f6c43ba5d00d50193f62f3c92c200
return new Browser(params);
}
@@ -462,7 +463,7 @@ Browser::Browser(const CreateParams& params)
@@ -456,7 +457,7 @@ Browser::Browser(const CreateParams& params)
window_(nullptr),
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index d4f4ba7efd1becb6e4e68ee363bb466d293a48a6..5e9642a73d792bcba7a1a989fd1626c8dd7b5583 100644
index 88edd87bcb2d0bb6eb0cb2d9d9b281d6655cbb18..a7ca18e18acd35a8cb95b843ac24a1b2bcedf102 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -590,6 +590,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -10,7 +10,7 @@ index d4f4ba7efd1becb6e4e68ee363bb466d293a48a6..5e9642a73d792bcba7a1a989fd1626c8
// Open System Apps in their standalone window if necessary.
// TODO(crbug.com/1096345): Remove this code after we integrate with intent
@@ -896,6 +897,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -910,6 +911,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
bool IsHostAllowedInIncognito(const GURL& url) {
std::string scheme = url.scheme();
base::StringPiece host = url.host_piece();
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 31af7b49a5d3f03a353df160050fabe84d48ed7a..df676d6c1faba5bf97e0a8e3a646502a4fce6c0f 100644
index 28732e323ec2e105bcd6675e9e339d8343f21c86..e3c6a53062a02a3b16f445b8d8ab634a0c4e09ba 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -78,7 +78,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index a5466937ff77f6591896919a2df969b833786ae4..be4d2e7ac9d003887a72b2037f358036fe0eb638 100644
index b36ca5df10936fa6972d1e41adc769b0ad7a0b06..3ea029a73dee70ff8e3f5d678899fadfbd205f99 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -340,7 +340,7 @@ void ShowSlow(Browser* browser) {
@@ -344,7 +344,7 @@ void ShowSlow(Browser* browser) {
#endif
}
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm
index 710d4da0e72f99ecb7abbe758b8b4a5acd89a9fe..4f47c4059222010e45c46754cc693d8e2611dad2 100644
index 698dc218f583dd0516f2deb386e2f0befa1290ef..6562e010879266b137bb57845aaf75da8259d2f3 100644
--- a/chrome/browser/ui/cocoa/main_menu_builder.mm
+++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
@@ -113,6 +113,7 @@ NSMenuItem* BuildFileMenu(NSApplication* nsapp,
@@ -109,6 +109,7 @@ NSMenuItem* BuildFileMenu(NSApplication* nsapp,
Item(IDS_NEW_INCOGNITO_WINDOW_MAC)
.command_id(IDC_NEW_INCOGNITO_WINDOW)
.remove_if(is_pwa),
@@ -10,7 +10,7 @@ index 710d4da0e72f99ecb7abbe758b8b4a5acd89a9fe..4f47c4059222010e45c46754cc693d8e
Item(IDS_REOPEN_CLOSED_TABS_MAC)
.command_id(IDC_RESTORE_TAB)
.remove_if(is_pwa),
@@ -483,6 +484,7 @@ NSMenuItem* BuildHelpMenu(NSApplication* nsapp,
@@ -479,6 +480,7 @@ NSMenuItem* BuildHelpMenu(NSApplication* nsapp,
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK),
#endif
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/color/BUILD.gn b/chrome/browser/ui/color/BUILD.gn
index 3dba3ad26c4770bfe4320625357b05b49f0e9c46..7a3db7510317c1c59af938d028b6da8e0d8d65f2 100644
index 0b42bdc5e5e818deb52bc7fe5d476401bcbf77e9..245ad0a93320e5bce088bb195d19df2d0a05f567 100644
--- a/chrome/browser/ui/color/BUILD.gn
+++ b/chrome/browser/ui/color/BUILD.gn
@@ -53,6 +53,7 @@ source_set("mixers") {
@@ -57,6 +57,7 @@ source_set("mixers") {
"//ui/color:color",
"//ui/color:mixers",
]
@@ -1,8 +1,8 @@
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 f0be13b7a0a1f7644bbca96041289115a75f1385..ca227b463aedf3bbb6effa8b93327fa941363a47 100644
index 2a4de33fb97a91c8835ff9e171946dedbcb96c4a..b1def6b8dc9f48cac528bb0893e609ccbb1fbc6c 100644
--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -171,6 +171,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
@@ -190,6 +190,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
if (rep.scale() != canvas->image_scale()) {
skia.AddRepresentation(
@@ -10,7 +10,7 @@ index f0be13b7a0a1f7644bbca96041289115a75f1385..ca227b463aedf3bbb6effa8b93327fa9
ScaleImageSkiaRep(rep, extensions::ExtensionAction::ActionIconSize(),
canvas->image_scale()));
}
@@ -181,6 +182,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
@@ -200,6 +201,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
(size().width() - extensions::ExtensionAction::ActionIconSize()) / 2.0);
int y_offset = std::floor(
(size().height() - extensions::ExtensionAction::ActionIconSize()) / 2.0);
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index acc14f6a6d94a860f1ddf4022923a8f64d7f4dd6..c5522201cefc6ea3a068509a8b813a08861af9af 100644
index d298f64756f263e7ad61573f33de1da35fa4883a..19ea349d295aaa273d898db7111e3601738cd652 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -395,6 +395,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
@@ -396,6 +396,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
welcome_enabled =
welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index b2b6330f5dbe5781919be02e933d1a115aef0399..a0b0fe8766451347c5901fe58cb635aed3e9df77 100644
index 1ec9817a39d4a15fe1b97d23dd5d0898133756ed..2cf3fa328035d0b7f4d8bab9ecdf081856f98b0a 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -713,4 +713,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -743,4 +743,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.
@@ -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 0f19f2bbd945a49e3c5dce182fe6de16775e4c21..f83e4c13cada2be0b8b28f723c74cdcd41d918d3 100644
index a584cad57ba3264f944b180072613d61cc201207..455a4f573d9198ef1b38721f67217dafb58187ae 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.h
+++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -581,6 +581,7 @@ class TabStripModel : public TabGroupController {
@@ -582,6 +582,7 @@ class TabStripModel : public TabGroupController {
// Serialise this object into a trace.
void WriteIntoTrace(perfetto::TracedValue context) const;
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
index bfaa95d9bc1302d872b42f5c9750b36ea95c6a5f..44fd60b9227b8f85624743898a19a051a5803a5b 100644
index b12ca875746ef64c05cbc9a1de0769a8f3c65f47..71da65021b83e37ef478963e3f9c1b654825232f 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
@@ -172,6 +172,7 @@ class RecentTabsSubMenuModelTest
@@ -172,6 +172,7 @@ class RecentTabsSubMenuModelTest : public BrowserWithTestWindowTest {
->GetUnderlyingOpenTabsUIDelegateForTest());
}
@@ -10,7 +10,7 @@ index bfaa95d9bc1302d872b42f5c9750b36ea95c6a5f..44fd60b9227b8f85624743898a19a051
private:
raw_ptr<sync_sessions::SessionSyncService, DanglingUntriaged>
session_sync_service_;
@@ -522,8 +523,8 @@ TEST_F(RecentTabsSubMenuModelTest, MaxSessionsAndRecency) {
@@ -580,8 +581,8 @@ TEST_F(RecentTabsSubMenuModelTest, MaxSessionsAndRecency) {
EXPECT_THAT(base::span<const std::u16string>(
recent_tabs_builder.GetTabTitlesSortedByRecency())
.subspan(0, 3),
@@ -21,7 +21,7 @@ index bfaa95d9bc1302d872b42f5c9750b36ea95c6a5f..44fd60b9227b8f85624743898a19a051
}
TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) {
@@ -560,6 +561,6 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) {
@@ -618,6 +619,6 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) {
EXPECT_THAT(base::span<const std::u16string>(
recent_tabs_builder.GetTabTitlesSortedByRecency())
.subspan(0, 4),
@@ -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 a5782751aa88915fe994c8efd2268ec1670b08e6..188941480c6f8bde7bef226ffd31df0759898ca6 100644
index d29e63dcccce0d71542febb1144a6611e16d2957..9fdccb7619d79a972332fea547e1a31b839ef1e9 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1095,6 +1095,7 @@ void BookmarkBarView::Layout() {
@@ -1120,6 +1120,7 @@ void BookmarkBarView::Layout() {
x = next_x;
}
}
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 8dfa343e77332d6139bc0dcebc72d7655b85a7fe..cf9697faa6514d513f84c2d866a90befea81b518 100644
index 3209a9a3c8e195dc60f2a4920e78751bd781c312..8589b281f6077e814804260b53f91282a23cd188 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -346,6 +346,7 @@ void BookmarkBubbleView::ShowBubble(
@@ -411,6 +411,7 @@ void BookmarkBubbleView::ShowBubble(
dialog_model_builder.Build(), anchor_view,
views::BubbleBorder::TOP_RIGHT);
bookmark_bubble_ = bubble.get();
@@ -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 8fd6c6b955e7e170ee5c691e64e7cb24cad07749..7dfdde8ffd62de221aa967417e6ba75c72a7786c 100644
index 83e19c00add9fb15101735925b279aedf45785ce..1fa7b9eb731c1b94d0f88d6f38600485737233aa 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -733,6 +733,7 @@ void LocationBarView::Layout() {
@@ -754,6 +754,7 @@ void LocationBarView::Layout() {
}
};
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index ea82e0da7874de775026870c9b1e2d514589b595..65d7732241c53163e525074563b2a92bd677cb43 100644
index 6fd3631dc90b578ca1adaef3d69b97611734ebf0..a0ab959e60515842c5b7ee77edf7c822f737dfb7 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -109,6 +109,7 @@ class LocationBarView : public LocationBar,
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
index f049ff08788fe6170dfd2ed3720e8d54ff58bb11..c14161f95ae338e9bea26f75111dfe760853e3a4 100644
index 0c4e36949a5f6251fa25f1a4c5a2e66a5a26ee58..5b5c7c81a70cff2ef883123e123555ab1bdd2f51 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -186,6 +186,7 @@ bool LocationIconView::GetShowText() const {
@@ -166,6 +166,7 @@ bool LocationIconView::GetShowText() const {
const auto* location_bar_model = delegate_->GetLocationBarModel();
const GURL& url = location_bar_model->GetURL();
if (url.SchemeIs(content::kChromeUIScheme) ||
@@ -1,8 +1,8 @@
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 311d0835a9a713b3e8ec6f0061ef0867baed730e..eb60395147e8837c4998e342fe191677c9cd419f 100644
index 9e5e40c912c00b70d921d422ce141cd9d4a5bcd3..1211fb980fc28cc3fa8a6805846288edb27b3fbd 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -639,6 +639,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) {
@@ -666,6 +666,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) {
max_size_ = new_max_size;
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
index 9800155375fa4fb592a0e7ddc041b669b3f9bc98..7b8e1ca57504f9ca04238b057ed7095164b3793b 100644
index f076917a8c9135f0c4c8cab129ee73fcbc3527f9..f4bf49cbe475d588f93d53e674657b238347b9d8 100644
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -554,6 +554,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const {
@@ -507,6 +507,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const {
if (site_settings_view_) {
width = std::max(width, site_settings_view_->GetPreferredSize().width());
width = std::max(width, permissions_view_->GetPreferredSize().width());
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
index 3525faa7224099b6944a0cb6aaf929edd87e973c..cc7e514eb6b17af0c39aee848680ae2b885904e1 100644
index c5a69cea384b4ab55b24dc9e16e499d45b4e1e88..5f09dbaff10ac0c1bc56dabac056972d8c7e8f03 100644
--- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
+++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
@@ -397,6 +397,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
@@ -409,6 +409,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
const gfx::VectorIcon* icon = &gfx::kNoneIcon;
switch (info.type) {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
index 849787d262d12abc3ee073ef360d9ced54731aba..7c67a68d6dd7c48698ccb73c9de17f970291a381 100644
index eac30a8386acea27f7b3133b0480d3ab65e1d5ab..a6747fa7c17671d52f1196131e490d6fcbe4bea4 100644
--- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
+++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
@@ -240,6 +240,7 @@ SidePanelRegistry* SidePanelCoordinator::GetGlobalSidePanelRegistry(
@@ -247,6 +247,7 @@ SidePanelRegistry* SidePanelCoordinator::GetGlobalSidePanelRegistry(
void SidePanelCoordinator::Show(
absl::optional<SidePanelEntry::Id> entry_id,
absl::optional<SidePanelUtil::SidePanelOpenTrigger> open_trigger) {
@@ -10,7 +10,7 @@ index 849787d262d12abc3ee073ef360d9ced54731aba..7c67a68d6dd7c48698ccb73c9de17f97
if (entry_id.has_value()) {
Show(SidePanelEntry::Key(entry_id.value()), open_trigger);
} else {
@@ -700,6 +701,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
@@ -737,6 +738,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
ChromeDistanceMetric::DISTANCE_SIDE_PANEL_HEADER_VECTOR_ICON_SIZE)));
header_close_button->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/tabs/new_tab_button.h b/chrome/browser/ui/views/tabs/new_tab_button.h
index 6f882fa3f2a81d52408499fc4d12453428e63fd7..fe6405971c097ef23d9aad6e474fe85dd6ccdce8 100644
index 924823dfd64f110824127144e9d47ae55c172aa9..866c0eda97c22756ced5e96a80b2fd0b5005295e 100644
--- a/chrome/browser/ui/views/tabs/new_tab_button.h
+++ b/chrome/browser/ui/views/tabs/new_tab_button.h
@@ -49,6 +49,7 @@ class NewTabButton : public views::ImageButton,
@@ -50,6 +50,7 @@ class NewTabButton : public views::ImageButton,
void AddLayerToRegion(ui::Layer* new_layer,
views::LayerRegion region) override;
void RemoveLayerFromRegions(ui::Layer* old_layer) override;
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 4dd15dfd0464cf374c864406e116884284e3e468..b004345d84ef15c8310fe673d27268072cd09f00 100644
index 6cfde5828cb0fbe1ea0c39d3bbec1267016b4eb5..f420905f286f5180be1ebcf36aa92b0802584034 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -393,6 +393,7 @@ void Tab::Layout() {
@@ -402,6 +402,7 @@ void Tab::Layout() {
int title_right = contents_rect.right();
if (showing_alert_indicator_) {
title_right = alert_indicator_button_->x() - after_title_padding;
@@ -10,7 +10,7 @@ index 4dd15dfd0464cf374c864406e116884284e3e468..b004345d84ef15c8310fe673d2726807
} else if (showing_close_button_) {
// Allow the title to overlay the close button's empty border padding.
title_right = close_x - after_title_padding;
@@ -1013,6 +1014,7 @@ void Tab::UpdateIconVisibility() {
@@ -1021,6 +1022,7 @@ void Tab::UpdateIconVisibility() {
available_width -= favicon_width;
showing_close_button_ = large_enough_for_close_button;
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/tabs/tab_group_views.cc b/chrome/browser/ui/views/tabs/tab_group_views.cc
index bbd00aec2b10a397596afa383c796df2d4f203a6..b1b3ac2a045d0652d41b9b62f6669bfeece4f4fc 100644
index 9d4de2ba573617c36fc93228aea87185ec19f4ce..b5010f91ac832c71f1c9a05f8cc359568688abef 100644
--- a/chrome/browser/ui/views/tabs/tab_group_views.cc
+++ b/chrome/browser/ui/views/tabs/tab_group_views.cc
@@ -178,6 +178,7 @@ TabGroupViews::GetLeadingTrailingGroupViews(
@@ -165,6 +165,7 @@ TabGroupViews::GetLeadingTrailingGroupViews(
views::View* trailing_child = nullptr;
gfx::Rect trailing_child_widget_bounds;
@@ -1,5 +1,5 @@
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 05548c1fd9b4a89e2a6dae03880dcb5543525304..50181d02b66dc536fa9d258650a98a33d45f9625 100644
index 9accd372c00fa25af82098358ac3d9e905fac8ab..729aee615aa1416341789391a755c9382b194147 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
@@ -71,6 +71,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView {
@@ -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 0f249fd410247bc80abee4f5dc9ecdcd9bc9396f..b18a50ec27009a64a8debb9354ff5977b1510baf 100644
index da7ae74dc5f212b6b8b17311751abc6269a71da1..2de5eb3c5656f3998e6b0a481e09b6bbcfb6603d 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -495,6 +495,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
@@ -496,6 +496,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
std::vector<gfx::Rect> CalculateBoundsForDraggedViews(
const std::vector<TabSlotView*>& views) override {
@@ -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 c9e50271f27162f10f20fe15e09ca7b4545d58d5..a4b489cad4cc8d909e236448e1ce61b04ee62f3f 100644
index 619f741f150975e1a93a32783f9bbfe78e9bee15..a0a09d22c024a5bacd27dfa60ae026ac0c09146b 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -441,6 +441,7 @@ void ToolbarView::Init() {
@@ -461,6 +461,7 @@ void ToolbarView::Init() {
container_view_->AddChildView(std::move(side_panel_button));
}
@@ -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 1fe6c2242c11fcab42a8a3bb698dfdb17ae6cb2d..b7c647f7edf8b66349593854c345bbe05f716b5d 100644
index 75ab7f0bbbeedb05a8b82f9e80e5200a5f89575e..0b4b93522f6007868c14849528c8226a17dde1a2 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -982,6 +982,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
@@ -988,6 +988,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
// static
ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc
index adf8f9b3fdf7a4280649106427515651cb9e753a..1bc92762ea3fa6559bcdb3a59c400b779e563fd2 100644
index aa26b88ebba2e3765623675519d71335ded67660..e0573ca48104112bbab625ae9e412816a7993bbb 100644
--- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
@@ -59,6 +59,7 @@ namespace {
@@ -60,6 +60,7 @@ namespace {
content::WebUIDataSource* CreateAndAddDownloadsUIHTMLSource(Profile* profile) {
content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd(
profile, chrome::kChromeUIDownloadsHost);
@@ -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 e7abdf55abaf79904201886cec4efe2cb24f2ad0..8444faf4f4580343fe27682cbd4c2035815f3904 100644
index 625352ca9ae74c09ecab797571b2075727717757..d4111c2a45895914675252b3c1c05b52a42b7062 100644
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -421,6 +421,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
@@ -433,6 +433,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
"safetyCheckShowReviewPanel",
base::FeatureList::IsEnabled(features::kSafetyCheckExtensions));
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index 77ebeea4178df00b03d61163e489c4a9112481e2..90a75584a90871f8b25cffb11fdb7aa855d89712 100644
index 32cc442c8bf1e6cf1e86b156697231839799898b..a5946468ff148195e81e33c4200acd9106360b85 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -890,6 +890,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
@@ -875,6 +875,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
void PeopleHandler::BeforeUnloadDialogCancelled() {
// The before unload dialog is only shown during the first sync setup.
@@ -10,7 +10,7 @@ index 77ebeea4178df00b03d61163e489c4a9112481e2..90a75584a90871f8b25cffb11fdb7aa8
DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount(
signin::ConsentLevel::kSync));
syncer::SyncService* service = GetSyncService();
@@ -939,6 +940,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const {
@@ -924,6 +925,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const {
service && !disallowed_by_policy && service->IsSetupInProgress() &&
!service->GetUserSettings()->IsInitialSyncFeatureSetupComplete() &&
identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync));
@@ -18,7 +18,7 @@ index 77ebeea4178df00b03d61163e489c4a9112481e2..90a75584a90871f8b25cffb11fdb7aa8
const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_);
// TODO(crbug.com/1027467): Consider unifying some of the fields below to
@@ -1102,6 +1104,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
@@ -1086,6 +1088,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
}
bool PeopleHandler::IsProfileAuthNeededOrHasErrors() {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index ba144779fd63d84fdb0279944fc32f0032a2d431..4c77f2bbab4ac63bf5ca69976905f38ca2ef0126 100644
index 2c54740738d1fbaf977eb150e91428596ff9ed94..aea9364a758b4efa90e14c8a2f4a6ea886d9d511 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3634,6 +3634,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -3710,6 +3710,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);

Some files were not shown because too many files have changed in this diff Show More