Update patches from Chromium 134.0.6998.95 to Chromium 135.0.7049.17.

This commit is contained in:
Claudio DeSouza
2025-03-18 20:01:59 -04:00
committed by Max Karolinskiy
parent 7a96b2b2de
commit 6db84dd4c6
251 changed files with 513 additions and 513 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 854457658bbdc09f21f61eb76928dfd423e1eedd..4d886fcd3339c23112565535f66bd56a61b04e98 100644
index da6b76717d7b7b7b0d13f89f1785281dd4d915a6..2883a9888e33f7e09c2351a0df9b79b573ec9541 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4482,6 +4482,7 @@ if (is_android) {
@@ -4495,6 +4495,7 @@ if (is_android) {
"android/java/src/org/chromium/base/ValueChangedCallback.java",
"android/java/src/org/chromium/base/WrappedClassLoader.java",
]
@@ -10,7 +10,7 @@ index 854457658bbdc09f21f61eb76928dfd423e1eedd..4d886fcd3339c23112565535f66bd56a
if (use_clang_profiling) {
sources += [
@@ -4953,6 +4954,7 @@ if (is_android) {
@@ -5027,6 +5028,7 @@ if (is_android) {
"android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
"android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java",
]
@@ -1,5 +1,5 @@
diff --git a/base/metrics/histogram_functions.h b/base/metrics/histogram_functions.h
index 9baec5417d6a097fb1d596b5c63a06bbf6cabf26..3f6577709bbede7b012b52b5247b5fd36a7f7109 100644
index 20ca685ec430c00760a72da425a3c32ece12b28c..dfea10f252e9a2413ff60cf18d7e911ae60cdb00 100644
--- a/base/metrics/histogram_functions.h
+++ b/base/metrics/histogram_functions.h
@@ -80,6 +80,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) {
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index 37a7e20c415f7db3bee798e0f925c6a3edcf7f32..cc805a8cff290539625f27334040359d4457af9d 100644
index 82fab133d08d67d9b7829f16605ac76413bcf1fd..9838e1538378c62d45ffc3fbd1c71ab2b522cd30 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -357,6 +357,7 @@ static_library("test_support") {
@@ -355,6 +355,7 @@ static_library("test_support") {
"trace_to_file.h",
]
}
@@ -1,5 +1,5 @@
diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc
index 9b9e170d73ae7a085cbf44a84c45b09ae3b33e18..9788dd691131b2f76849407f0b993ad6251dcc75 100644
index 1bf546b57fa37089d91a32fe32456a63aa22c748..f0f1a8f58be6296fc3ecca10e3c41ae522ccd65f 100644
--- a/base/test/launcher/test_results_tracker.cc
+++ b/base/test/launcher/test_results_tracker.cc
@@ -152,6 +152,7 @@ TestResultsTracker::~TestResultsTracker() {
@@ -1,8 +1,8 @@
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index ab355bfa81e995e31aa0decf68e1275c9bd69657..db17daffb0ee4930cab043152b2960757850b1a6 100644
index 56ddbc2d4fa336bcdbe9aaacd4bf8bbaa3573239..265bbde9b3514c209ea50e9cb6eb84ab11a7f4e5 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -732,6 +732,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
@@ -728,6 +728,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
ScopedAllowBaseSyncPrimitives& operator=(
const ScopedAllowBaseSyncPrimitives&) = delete;
@@ -1,8 +1,8 @@
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index 397fd890b7db6aed6f75ee3d685fe4b7c22e875f..d5df6689fc7ae7ed59ada8670731cf29b44942b8 100644
index c428a5f8d79e826077ab05fb6c56ae8e0e4ff609..c9dcb476ffce5d6b41f71b1422c68c1bcbeba822 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -208,6 +208,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
@@ -207,6 +207,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
perfetto::Category("webrtc"),
perfetto::Category("webrtc_stats"),
perfetto::Category("xr"),
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/version_info/BUILD.gn b/base/version_info/BUILD.gn
index fea0d0e00d8a63a1eca8f51b5041caa887e852ac..29ccc0ada686eaa097cfcef4d4f6a94301dede50 100644
index b1f13fa6e555a874d1f96eacefcd5a8401739c75..aa0a9cd343d9ba3134e3673f295a2c73c7104474 100644
--- a/base/version_info/BUILD.gn
+++ b/base/version_info/BUILD.gn
@@ -24,6 +24,7 @@ static_library("version_info") {
@@ -23,6 +23,7 @@ static_library("version_info") {
":generate_version_info",
"//base",
]
@@ -1,8 +1,8 @@
diff --git a/build/android/gyp/create_app_bundle.py b/build/android/gyp/create_app_bundle.py
index 279898876b70c759dcfd1762a6ac36eee2559caf..7c2a51bbc051dafd81334474e4f54dfa7abc2276 100755
index 43efec3ce978c0c425d6da169ef2e7ae47e04bb3..59b42cdace895df93d90f8ad3400d2fd1b30098d 100755
--- a/build/android/gyp/create_app_bundle.py
+++ b/build/android/gyp/create_app_bundle.py
@@ -80,6 +80,7 @@ _ALLOWLISTED_NON_BASE_SERVICES = {
@@ -79,6 +79,7 @@ _ALLOWLISTED_NON_BASE_SERVICES = {
'com.google.apps.tiktok.concurrent.InternalForegroundService',
}
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
index ff2df0113967324f05797c05fe4f1f9a9f087a5c..5cc8745e35e27431ebc99bf72b53ac59c0a93ca7 100755
index 2e562de665f81b986a19b540e1b13090b32594e0..7d5d73a78a6e884f162317e327653d7132a392f0 100755
--- a/build/android/gyp/proguard.py
+++ b/build/android/gyp/proguard.py
@@ -381,6 +381,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
@@ -374,6 +374,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 c01896919e5a4549bd5e1d2d8d54f69fcb2b8aa6..0a85381cd077fc8e3f1015498d00f9d2e88ca11d 100644
index 632de02789948ae581e57359e1bc303b2106bf46..87b1265814a91f72494c04d847a3b4c2acbe2b23 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -340,6 +340,7 @@ is_posix = !is_win && !is_fuchsia
@@ -1,5 +1,5 @@
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 5480b31d91ce585458596bab6031fbaac9228b90..8a225378df67f85067b7c31a54c90921372c9a48 100644
index 13bf3e43a5fdcdd001b7aa9113732e9a9209ac76..f7089c4f1f993938f5bdb4ce6439b7ea65e5f40f 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -29,6 +29,7 @@ assert(!(incremental_install && !is_java_debug),
@@ -1,8 +1,8 @@
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 04dc65115fb7f677bfa36087c1f08c96e44b95b2..cff2b1bae98ec7c39e87399f70400e6f80a523bc 100644
index 2585163776efcd3bb3b173d7430d74dd889357bf..3fd7eb12f69d334d3e63ca1606f29a1ed0d379d8 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -4219,6 +4219,7 @@ if (enable_java_templates) {
@@ -4231,6 +4231,7 @@ if (enable_java_templates) {
} else {
not_needed(invoker, [ "missing_classes_allowlist" ])
}
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index be82605fa87067e865bdb82e81a4898916766620..2f4cd137bc23882bf5d60056366e8b2dfaf9d6b5 100644
index fbb3ba1e994e45aa5890c61c8582f4ead95f8e09..67fd52e54887d66002a4ddbf17156bd72c3edbaa 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -208,6 +208,7 @@ if (!is_robolectric && enable_java_templates) {
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/dotfile_settings.gni b/build/dotfile_settings.gni
index 29e01306126b6635297457e4452f090f0f519964..95a6c891abdfcb73ea91c5fb17e3acb1e8862f3a 100644
index b2c1bc1f18b1ff70096861e6d0b1e653c532e70b..acdf9028dcc6c35f0036a86b7aacfd979209ec46 100644
--- a/build/dotfile_settings.gni
+++ b/build/dotfile_settings.gni
@@ -47,3 +47,4 @@ build_dotfile_settings = {
@@ -45,3 +45,4 @@ build_dotfile_settings = {
# so that we don't need to keep supporting `exec_script_whitelist`.
exec_script_whitelist = exec_script_allowlist
}
@@ -1,5 +1,5 @@
diff --git a/buildtools/checkdeps/checkdeps.py b/buildtools/checkdeps/checkdeps.py
index 19e0854786de291fd9c94ac64dbbe181faee6180..55e02d2aee620da2312c0d41e5965ea828fc471b 100755
index 00e5da345c451a66c33fabd206b91093b01e6351..121bcb8849264e00650d6ac421fddac383654687 100755
--- a/buildtools/checkdeps/checkdeps.py
+++ b/buildtools/checkdeps/checkdeps.py
@@ -290,5 +290,6 @@ def main():
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 9bb34fe40f0cc08cb832ee6728ac8e32458c969b..ee4d625c34c7c5d3eaa05d358878288a00b22ca7 100644
index 7bad6d2fe242bc71014d3fbd6be4481280297366..43ec99f41b188d0edcf52aa18808113b5a95e5fb 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -195,6 +195,7 @@ if (!is_android && !is_mac) {
+10 -10
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb1828c153 100644
index cd1f242c915a4dca7b547f8261eac658bfe5707f..d510fd20d8b9e9324e735742b2fa8b2e24155d66 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -189,6 +189,7 @@ if (current_toolchain == default_toolchain) {
@@ -187,6 +187,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",
]
@@ -10,7 +10,7 @@ index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
}
android_resources("chrome_app_java_resources") {
@@ -286,6 +287,7 @@ if (current_toolchain == default_toolchain) {
@@ -284,6 +285,7 @@ if (current_toolchain == default_toolchain) {
if (enable_screen_capture) {
deps += [ "//chrome/browser:screen_capture_java_resources" ]
}
@@ -18,7 +18,7 @@ index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
}
android_resources("java_overlay_resources") {
@@ -766,6 +768,7 @@ if (current_toolchain == default_toolchain) {
@@ -767,6 +769,7 @@ if (current_toolchain == default_toolchain) {
]
deps += feed_deps
@@ -26,7 +26,7 @@ index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
srcjar_deps = [
":chrome_android_java_enums_srcjar",
@@ -782,6 +785,7 @@ if (current_toolchain == default_toolchain) {
@@ -783,6 +786,7 @@ if (current_toolchain == default_toolchain) {
"//components/sharing_message:sharing_send_message_result_generated_enum",
"//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
]
@@ -34,7 +34,7 @@ index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
# From java_sources.gni.
sources = chrome_java_sources
@@ -904,6 +908,7 @@ if (current_toolchain == default_toolchain) {
@@ -909,6 +913,7 @@ if (current_toolchain == default_toolchain) {
"//components/saved_tab_groups/public:conversion_utils_java",
"//components/segmentation_platform/internal:internal_java",
]
@@ -42,7 +42,7 @@ index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -1591,6 +1596,7 @@ if (current_toolchain == default_toolchain) {
@@ -1603,6 +1608,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 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
# Dep needed to ensure override works properly.
deps = [ ":chrome_base_module_resources" ]
@@ -1803,6 +1809,7 @@ if (current_toolchain == default_toolchain) {
@@ -1815,6 +1821,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -58,7 +58,7 @@ index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
}
@@ -2081,6 +2088,7 @@ if (current_toolchain == default_toolchain) {
@@ -2095,6 +2102,7 @@ if (current_toolchain == default_toolchain) {
"//third_party/androidx:androidx_annotation_annotation_experimental_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -66,7 +66,7 @@ index 9cd6abf563e8b515f80abbe71267b0654e527db4..3e19087e7209f09172367f240a6976bb
# More deps for DFMs.
if (dfmify_dev_ui) {
@@ -3180,6 +3188,7 @@ generate_jni("chrome_jni_headers") {
@@ -3207,6 +3215,7 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
"java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
]
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 64ed77fb95b4c9cb92b22436c217ac9775bb757f..4c749d57ff94cfcf03a76bb1d65c9215e9870578 100644
index 2025e554a74d02fc638b7ec4d47db0b201c0ea9a..6673659cdae28234944405f6885869378ccbff6a 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1238,3 +1238,4 @@ if (enable_screen_capture) {
@@ -1169,3 +1169,4 @@ if (enable_screen_capture) {
"java/src/org/chromium/chrome/browser/media/MediaCapturePickerItemViewBinder.java",
]
}
@@ -1,5 +1,5 @@
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index b1ab5a7b2a4522ece9a277673ae95430afc4f3a6..e7071b6e2fda8ea91f56b79b0d37d1768c94d5e2 100644
index 44d95c96a3deaf5f15871bb5e105616afd426699..86172e5d13929dd040c0ccc83b7f5c3912eb308b 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -319,6 +319,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -1,8 +1,8 @@
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
index bfeb16019ca06f2cd603a68a550728abd601ed23..fd7e7c7195495f29dfdba1408198b7c2d6fec462 100644
index 0154319845b0720f9d3f017e4f1375a2e0063972..62ae01d96deb9bd8695c7ea0760ac9a74f4b4148 100644
--- a/chrome/android/features/tab_ui/BUILD.gn
+++ b/chrome/android/features/tab_ui/BUILD.gn
@@ -119,6 +119,7 @@ android_resources("java_resources") {
@@ -121,6 +121,7 @@ android_resources("java_resources") {
"java/res/xml/tab_archive_time_delta_preference.xml",
"java/res/xml/tabs_settings.xml",
]
@@ -1,5 +1,5 @@
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
index f13f117522639750b3d1f979bd7020900c90ba6e..010ae0911b8a7b8982a877ce83d5f29f0816c1f8 100644
index 935df752479098ff882afaf46043f96bd532e175..6b654aea1a5a80dee7a721bed6e1f5dbac6c2b07 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
@@ -372,7 +372,7 @@ public class FeedSurfaceMediator
@@ -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 86d47316899b1872d4d6751f5154f3d6f469e25f..9d57752110c2d69538550c05e856054821ed9120 100644
index 64694353ca0095c099e5941fa02098cbc7a7f84e..badd4f0ac06d16889e010cc17b9e4180cf952f64 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
@@ -172,7 +172,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -171,7 +171,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
Action.SHARE_HIGHLIGHT,
Action.REMOVE_HIGHLIGHT,
Action.LEARN_MORE,
@@ -11,7 +11,7 @@ index 86d47316899b1872d4d6751f5154f3d6f469e25f..9d57752110c2d69538550c05e8560548
})
@Retention(RetentionPolicy.SOURCE)
public @interface Action {
@@ -217,7 +217,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -216,7 +216,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 86d47316899b1872d4d6751f5154f3d6f469e25f..9d57752110c2d69538550c05e8560548
}
}
@@ -374,6 +374,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -312,6 +312,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/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
index c9979ab733723c80f617f34852c1bf7fbbe2732c..cda93fa3fffc766a729c7ccdd5666fa7afdd05e9 100644
index de78a81263c4564b5371c668f10f695cbec8cce9..5da176ba9d07805fc88193c5083b7265a957bc1c 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
@@ -65,7 +65,7 @@ import org.chromium.chrome.browser.ui.signin.SigninUtils;
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index ab4deb1a228f512166251cce44aac7138e53c1f8..650636a69ae45b6515d5fb287335b4fe3fd4e066 100644
index 935484239812bc01bcf879bec0810e2551043e81..9238188d131c8b71848a25109f2f49835081abc3 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2529,6 +2529,7 @@ static_library("browser") {
@@ -2550,6 +2550,7 @@ static_library("browser") {
} else {
sources += [ "net/net_error_diagnostics_dialog_stub.cc" ]
}
@@ -10,7 +10,7 @@ index ab4deb1a228f512166251cce44aac7138e53c1f8..650636a69ae45b6515d5fb287335b4fe
if (is_android) {
sources += [
@@ -8373,6 +8374,7 @@ static_library("browser_public_dependencies") {
@@ -8403,6 +8404,7 @@ static_library("browser_public_dependencies") {
"//rlz:rlz_lib",
]
}
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3f39aa632c6fa52ce9f9a1748a6dc68e9791ed99..4f4e8dbd2516eb49ddb31af25bb2b042d19c2782 100644
index 2e8ad258a2a5459e061df4a83c0d612d1cbfb310..02a856e86ef4c2d47e126a54b94bb3fd3eb95f6e 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4407,6 +4407,7 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] =
@@ -4409,6 +4409,7 @@ const FeatureEntry::FeatureVariation
//
// 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/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index db887bc023639301e2f939c952544e51ca5eb25a..c0466a8fd4105ad6f90aff8e6aa5b9c02eccedeb 100644
index c9600922e50e0007c453ba8956916cd9ed60e739..c9182e85bf7a8b7e0e9eb12806c808a7c5c0c0ce 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -246,6 +246,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -243,6 +243,7 @@ class BrowserProcessImpl : public BrowserProcess,
void CreateGlobalFeaturesForTesting() override;
private:
@@ -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 e7f573eff852cdf57dd05ede711ba9ba1b1f11e0..e54ffa5def3a25e2d657bf8c04e311214c3fc1c5 100644
index 1d98f2e01e1db1a17383774d66d2fff9a4b97c89..cfd92aacbd25623fc2048d0b10ec9c8c9802553c 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -1677,6 +1677,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
@@ -1676,6 +1676,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
return "WebrtcVideoPerfHistory";
case TracingDataType::kMediaDeviceSalts:
return "MediaDeviceSalts";
@@ -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 99101411ce40137b106131e12e2f0cd8b16659f3..5e5776c8afed519fe018d75736f03eadcc07068e 100644
index c8585bdaf839ff156aa2a968f3a3c948550f02f4..f4ac002a55e9364f09ab0dacd82e1f84321392e6 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -95,6 +95,7 @@ class ChromeBrowsingDataRemoverDelegate
@@ -94,6 +94,7 @@ class ChromeBrowsingDataRemoverDelegate
void OverrideDomainReliabilityClearerForTesting(
DomainReliabilityClearer clearer);
@@ -10,7 +10,7 @@ index 99101411ce40137b106131e12e2f0cd8b16659f3..5e5776c8afed519fe018d75736f03ead
private:
using WebRtcEventLogManager = webrtc_event_logging::WebRtcEventLogManager;
@@ -150,8 +151,9 @@ class ChromeBrowsingDataRemoverDelegate
@@ -149,8 +150,9 @@ class ChromeBrowsingDataRemoverDelegate
kMediaDeviceSalts = 45,
// See also kDisableAutoSigninForProfilePasswords.
kDisableAutoSigninForAccountPasswords = 46,
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/content_settings/BUILD.gn b/chrome/browser/content_settings/BUILD.gn
index c236e757f0bca1edc6b51c0a7441e175ee61b840..910031d15379ac63b47a3bff6c286beef7852cab 100644
index 4130f3bd222983d433a54cc399dcf8f8dbe14ea6..05c62a12c5b5eee6a196c78b379883815cf1dd28 100644
--- a/chrome/browser/content_settings/BUILD.gn
+++ b/chrome/browser/content_settings/BUILD.gn
@@ -110,6 +110,7 @@ source_set("impl") {
@@ -116,6 +116,7 @@ source_set("impl") {
if (enable_pdf) {
deps += [ "//chrome/browser/pdf" ]
}
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
index 643c18ab2a26477ac5aedba62112385af9ed9874..815f5585a089e933505ee80006a279395e5ca17b 100644
index 61cff67a70503be691442433115ce2315bcdb18d..14aadc598b89115bbb2cac24525b18b2c57a201a 100644
--- a/chrome/browser/download/download_item_model.h
+++ b/chrome/browser/download/download_item_model.h
@@ -151,6 +151,7 @@ class DownloadItemModel : public DownloadUIModel,
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
index 440666d4c72c3bf6c80c0ccfb291379e911e4e8e..9cf8bdf551ba55ff8e46264f3ab7e0f39305f4e2 100644
index 30f54fd479fa9e6e4be69ce44f37dddfdc86ab52..c2b9f98f7af285e75d4f8683a2c15930e614c73a 100644
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1325,6 +1325,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 211fb3399e4a46f629a9dede33e495cc16051b78..6d5c08167a8936e80ab4da1581a5728aa20d646e 100644
index 668e8d6f415a3e17efd4dc7bbf3667d0e2fd2786..f0e41257dee6a0ab776d289d66f6bbad2109a613 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1460,6 +1460,7 @@ source_set("extensions") {
@@ -1476,6 +1476,7 @@ source_set("extensions") {
allow_circular_includes_from += [ "//chrome/browser/glic:impl" ]
}
} # if (enable_extensions)
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index c1cb5482f8fe4e8b32d9713620a93a206b655e01..07f07bf31d89c40b8feceaacbabb655fa9cb0276 100644
index eb2350fca94903c7042fdd7dba141a71522dc24b..b7c55094dc3c847758bb4235af3d0d2011e4c3f1 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -1057,6 +1057,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
index 1670df56885596e6424e2a7a80a84d88fa8feaa5..505c4f225de2770e99366aabb6ad14f18afbb214 100644
index e988190705de58a06826ea17e789a01e8e7be24a..9c2cac7220d9f2fdd01120cbbe3650957a52b521 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -263,6 +263,7 @@ bool WebRtcEventLogUploaderImpl::PrepareUploadData(std::string* upload_data) {
@@ -262,6 +262,7 @@ bool WebRtcEventLogUploaderImpl::PrepareUploadData(std::string* upload_data) {
}
void WebRtcEventLogUploaderImpl::StartUpload(const std::string& upload_data) {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
index 2d2a23fb8ba6e9ff474eb14b2f86ed684164980f..a38f3cba09fa1c991c6bc9a4ff082c492d28e7b1 100644
index 6172daf31855ebe47ec988f6aecdb7c077d865ac..59354756e97af633cb73af813a658d5107005b0f 100644
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -496,6 +496,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
@@ -493,6 +493,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
void WebRtcLogUploader::UploadCompressedLog(
WebRtcLogUploader::UploadDoneData upload_done_data,
std::unique_ptr<std::string> post_data) {
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
index 99aecddc3e3805adfbe03678cf55f68dedc7e58f..2b826f40c85d4bde2b508fddef1d0e7b019e57ff 100644
index e0697423f99bd25c4608cd5484bec95bb74ac303..5295cc3853940b294a48949f57c3f68f2f94d3a9 100644
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -616,6 +616,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
@@ -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 acef4b496befd7d7c3a2f4b763d73f5144c63e5f..b60ffc550428c7aea3b110ba4dd2d23b694ab429 100644
index c4fc3c7ec7e6583b3cb72f6d6d843ba6ba1b8397..c59cee5dd696a373f13e72215e44502294848797 100644
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -409,7 +409,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
@@ -408,7 +408,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
if (!manager_)
return;
manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
index 5bed1dc1fe971720ad4dbcf8beaa8e76d64ad84c..af5298de027f37236238fa667b72b5a4c73e4a4b 100644
index a1a50693e330e93c7a1eb99f145db5502c851dcb..df20c92c5f48c3dcc58d96e1b5be882542a8cd55 100644
--- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
+++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
@@ -75,6 +75,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
@@ -78,6 +78,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
ChannelId.COLLABORATION,
ChannelId.DOWNLOADS,
ChannelId.INCOGNITO,
@@ -10,7 +10,7 @@ index 5bed1dc1fe971720ad4dbcf8beaa8e76d64ad84c..af5298de027f37236238fa667b72b5a4
ChannelId.MEDIA_PLAYBACK,
ChannelId.SCREEN_CAPTURE,
ChannelId.CONTENT_SUGGESTIONS,
@@ -130,7 +131,8 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
@@ -133,7 +134,8 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
String USB = "usb";
}
@@ -20,7 +20,7 @@ index 5bed1dc1fe971720ad4dbcf8beaa8e76d64ad84c..af5298de027f37236238fa667b72b5a4
@Retention(RetentionPolicy.SOURCE)
public @interface ChannelGroupId {
String SITES = "sites";
@@ -158,6 +160,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
@@ -161,6 +163,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
Map<String, PredefinedChannel> map = new HashMap<>();
Set<String> startup = new HashSet<>();
@@ -28,7 +28,7 @@ index 5bed1dc1fe971720ad4dbcf8beaa8e76d64ad84c..af5298de027f37236238fa667b72b5a4
map.put(
ChannelId.BROWSER,
PredefinedChannel.create(
@@ -397,6 +400,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
@@ -400,6 +403,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
static {
Map<String, PredefinedChannelGroup> map = new HashMap<>();
@@ -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 3b28efd187984303cdd624b5d84f8bcbb9b46d68..ee477863383b0c0e1dcd70a6cf6d18271fd6e4a3 100644
index d3519b2140f86e2f546b74b1478b92ba822616c0..8e2f4097e9eef5ddb796dedfc2aeedf8865ed2f9 100644
--- a/chrome/browser/notifications/notification_display_service_impl.cc
+++ b/chrome/browser/notifications/notification_display_service_impl.cc
@@ -115,6 +115,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
@@ -119,6 +119,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
std::make_unique<NearbyNotificationHandler>());
}
#endif
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3cc0bb183d1d11dafe88d4b6cedaf14aee0eb86b..a8b9069ba4672996545a8699320a1c5a40a6358c 100644
index c95fca6d405cd53d39cbe68309384e4914089ff6..70764ec71935860f82fbfeabb2e1c4d3373ebb43 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1936,6 +1936,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1841,6 +1841,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(prefs::kToastAlertLevel, 0);
// This is intentionally last.
@@ -10,7 +10,7 @@ index 3cc0bb183d1d11dafe88d4b6cedaf14aee0eb86b..a8b9069ba4672996545a8699320a1c5a
RegisterLocalStatePrefsForMigration(registry);
}
@@ -2377,6 +2378,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2271,6 +2272,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterIntegerPref(prefs::kLensOverlayStartCount, 0);
registry->RegisterDictionaryPref(prefs::kReportingEndpoints);
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 88e5b23953ed69688fb29b04c307b2dd4b38fc4f..1231f1f7b38d7317d31cd7a9cafdb4e4acf2eeb8 100644
index 3d946ce955030f629a87ed99e1493d0938e2a153..44dac2ac268a8a452aca3ead37152d7c53038e8d 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -186,6 +186,7 @@ const auto kTrackedPrefs = std::to_array<prefs::TrackedPreferenceMetadata>({
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
index 5388420f8201b608c223184ae15e14b842e1f264..73d13d35468545abaac5cdee62f300816ffcb5ec 100644
index 5e38eaa11c6a05a43f7417da3e0c0539d8243a55..7ad9e03b47dd5eeb1590a0cd8ddd84e07b5179e7 100644
--- a/chrome/browser/profiles/profile_attributes_entry.cc
+++ b/chrome/browser/profiles/profile_attributes_entry.cc
@@ -1084,6 +1084,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) {
@@ -1085,6 +1085,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) {
// This method should be periodically pruned of year+ old migrations.
void ProfileAttributesEntry::MigrateObsoleteProfileAttributes() {
@@ -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 a972d449ff08f76f82b055be9cb1d8b578469f5a..ebeee48dedcc7dc4d262c809a131d9110d2d0e5b 100644
index a6dd56a5adf761cdc8f8e39a0f3eac5ecaa5012e..9099ff51bbbc2db9d0d96d8807eef6ca3cf0ccc0 100644
--- a/chrome/browser/profiles/profile_avatar_icon_util.cc
+++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
@@ -423,7 +423,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
@@ -428,7 +428,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
#elif BUILDFLAG(IS_CHROMEOS_ASH)
constexpr size_t kDefaultAvatarIconsCount = 27;
#else
@@ -11,7 +11,7 @@ index a972d449ff08f76f82b055be9cb1d8b578469f5a..ebeee48dedcc7dc4d262c809a131d911
#endif
#if !BUILDFLAG(IS_ANDROID)
@@ -603,6 +603,7 @@ size_t GetPlaceholderAvatarIndex() {
@@ -611,6 +611,7 @@ size_t GetPlaceholderAvatarIndex() {
size_t GetModernAvatarIconStartIndex() {
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
@@ -19,7 +19,7 @@ index a972d449ff08f76f82b055be9cb1d8b578469f5a..ebeee48dedcc7dc4d262c809a131d911
return GetPlaceholderAvatarIndex() + 1;
#else
// Only use the placeholder avatar on ChromeOS and Android.
@@ -636,6 +637,7 @@ std::string GetPlaceholderAvatarIconUrl() {
@@ -644,6 +645,7 @@ std::string GetPlaceholderAvatarIconUrl() {
const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) {
CHECK_LT(index, kDefaultAvatarIconsCount);
@@ -27,7 +27,7 @@ index a972d449ff08f76f82b055be9cb1d8b578469f5a..ebeee48dedcc7dc4d262c809a131d911
static const std::array<IconResourceInfo, kDefaultAvatarIconsCount>
resource_info = {{
// Old avatar icons:
@@ -956,6 +958,7 @@ base::Value::List GetIconsAndLabelsForProfileAvatarSelector(
@@ -964,6 +966,7 @@ base::Value::List GetIconsAndLabelsForProfileAvatarSelector(
selected_avatar_idx == GetPlaceholderAvatarIndex());
avatars.Insert(avatars.begin(),
base::Value(std::move(generic_avatar_info)));
@@ -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 b14b639735870711562c305092c6f2ea74b29a16..5f99d9535df797053d3dec0868389ec1f4e5c74f 100644
index d73cefd1f7df0fb3a300173409d1ea928490e23c..71dfab0a40e0f2314ce2c951b559901c3db2f88a 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -2364,6 +2364,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -2380,6 +2380,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
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 e58e041b3ff5888b787ee8209b9a23fdfffa8192..2516eab9618bc06b6534408c86aa8df418bd36ed 100644
index f9c86beaffb8e56d2f8343b9865e89ec8aba8aed..17ca48037719ea87ddba8cfbd506cde7c62f188f 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -201,6 +201,7 @@ class RenderViewContextMenu
@@ -204,6 +204,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/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts
index 9eaf18e6f6e65585e6c64fc29dc10b6f5be79fc1..64939372b7998be016119b0096206ecc286f6b32 100644
index 4821b67b720fbdb283e795e129a9c94dc843407d..2bceba05dc7c11c2bee65706490aa402afdb8ebc 100644
--- a/chrome/browser/resources/bookmarks/command_manager.ts
+++ b/chrome/browser/resources/bookmarks/command_manager.ts
@@ -424,7 +424,7 @@ export class BookmarksCommandManagerElement extends
@@ -445,7 +445,7 @@ export class BookmarksCommandManagerElement extends
chrome.bookmarkManagerPrivate.export();
break;
case Command.HELP_CENTER:
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
index 7e798036f481bfbf501cb9bc8e51edf3e3ff0da3..e7f163bda11cda9856afcd16527b988a3b2592ef 100644
index f99153b36f3fac6024c6f57659c5c58aeed151df..7325f70280c4122c51c33f3b006d3732c8f1137f 100644
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -447,4 +447,5 @@ build_webui("build") {
@@ -445,4 +445,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 cd8ace31f26ba562c8a9fe8c25e02361eb198565..1aa411e3cfd16accbaadcb56e130c59af9fb63d7 100644
index 6a1d9078cf2adf66f6279de9012f901c8428f910..7dc5304e115c0b0bf3fc42d55cfa4a4f1e7d490c 100644
--- a/chrome/browser/resources/settings/people_page/sync_controls.ts
+++ b/chrome/browser/resources/settings/people_page/sync_controls.ts
@@ -97,7 +97,7 @@ export class SettingsSyncControlsElement extends
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/cr_lottie.ts b/chrome/browser/resources/settings/privacy_page/cr_lottie.ts
index 9fa56cc13b42594b59b3dae88bed0a09398f0474..0b7f6e854abf938678e13f139dd4204734661013 100644
index df65d69c2f134aa3954de2bdd7b355e37744fa1f..d3a4cdd2265268b69bae23f6684b26319d15ceef 100644
--- a/chrome/browser/resources/settings/privacy_page/cr_lottie.ts
+++ b/chrome/browser/resources/settings/privacy_page/cr_lottie.ts
@@ -344,6 +344,7 @@ export class CrLottieElement extends CrLitElement {
@@ -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 03e347503a03866b3a95c4087a2471a76a856c3d..417119a3f260064cb22a50bce232007d94ddc245 100644
index 67bb71d1702871198fde6c8ed726f0373095fa6d..d9aca4ddd0c8e238d5a1bbff490c375b0c48769f 100644
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -91,7 +91,7 @@ export class SettingsPersonalizationOptionsElement extends
@@ -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 7f98d8ac8d2f3be3bbae49c8128f15e053643137..484830cb3accd522d23773578cab2b5942de9a6b 100644
index e370bdef2b6ddb0499ee1544ec61ac141ecf1adc..f7af74fec167b16baa4b35f69a72a58cf5452605 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -36,6 +36,7 @@
@@ -43,6 +43,7 @@
<settings-animated-pages id="pages" section="privacy"
focus-config="[[focusConfig_]]">
<div route-path="default">
@@ -10,7 +10,7 @@ index 7f98d8ac8d2f3be3bbae49c8128f15e053643137..484830cb3accd522d23773578cab2b59
<cr-link-row id="clearBrowsingData"
start-icon="cr:delete"
label="$i18n{clearBrowsingData}"
@@ -310,6 +311,7 @@
@@ -317,6 +318,7 @@
</settings-subpage>
</template>
</template>
@@ -18,7 +18,7 @@ index 7f98d8ac8d2f3be3bbae49c8128f15e053643137..484830cb3accd522d23773578cab2b59
<template is="dom-if" route-path="/content/backgroundSync" no-search>
<settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"
search-label="$i18n{siteSettingsAllSitesSearch}"
@@ -337,6 +339,7 @@
@@ -344,6 +346,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 2e5d4330a63fd8a5b9a66eb97523fc60dcfae8a6..046ae235cd63c60f4600f52b4414aae8c29d769c 100644
index 665becf31aa7afa527e851f939da189061fadfb3..7aa857f9a9abd558f388000315c753f5412d2d44 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -22,6 +22,7 @@ import '../settings_page/settings_subpage.js';
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
index 001852c43411eae58fc41e4c4dc35af64076c6c9..72127b44ee5d7098a9dcfdb63e240acfabd7f2b4 100644
index 16d1a68dccf8773fbbba6399b81e5c8002048618..9d5e3ef2b39268e74b7ab8dc2bd42b6335454e54 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';
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
index 57b51014e87321a6f005d88a2d40731045d289e9..a618988150701bd29a10fcbb70f8cc47aceab953 100644
index 9474c5528dbb86560e240176f1453ec2061a7ace..4cc129e90ccdf84197294e8ad962c8ad4a915138 100644
--- a/chrome/browser/resources/settings/router.ts
+++ b/chrome/browser/resources/settings/router.ts
@@ -120,6 +120,7 @@ export interface SettingsRoutes {
@@ -121,6 +121,7 @@ export interface SettingsRoutes {
IMPORT_DATA: Route;
SIGN_OUT: Route;
// </if>
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
index 83a5870db8653255dc51b61bff4b4a0879da37dd..f5065fec953e2d633becf3fad4562c586b65b842 100644
index ef09c67f656fd316af2ef639bf4773cb7d576576..7a88a74f920af4867b3ff92394e9971be0f2c026 100644
--- a/chrome/browser/resources/settings/settings.ts
+++ b/chrome/browser/resources/settings/settings.ts
@@ -2,6 +2,7 @@
@@ -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 619d694def4c49732e55b471d1caac91e0d99ce3..d8de4f5c20f7d59c972a53edfbd87f8e5adc2252 100644
index 2d664bc4a07204f9f5c0c502a00ff108b72c8e36..99b66fe998f2515d1b9a08c94e2590e1cfd90050 100644
--- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
+++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
@@ -3,6 +3,7 @@
@@ -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 9a847ad3b44a7be841c8c943ecf9293dd6876f3a..54feb4ed95fd1129f1a608bd8f9e080f3a9e9da1 100644
index 89a4cfd37f629d00b914a6514049e5eea7d9d227..647711690e1ceb5dc534f6b89ae0e3d96b605023 100644
--- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn
+++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
@@ -68,7 +68,7 @@ build_webui("build") {
@@ -69,7 +69,7 @@ build_webui("build") {
target_gen_dir) ]
webui_context_type = "untrusted"
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/signin/profile_picker/profile_card.html.ts b/chrome/browser/resources/signin/profile_picker/profile_card.html.ts
index 8fcf1023fc7ce94f39314cddbecbdbd92505ca5d..b43a8a6e0dde60ac49222f15b6d6e236d1378788 100644
index 1aaf591af5d51f3268fdf1413592cb95c3a60066..286c6db5fc27b75e9db2fbe3ebeacbd5f9950cdc 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_card.html.ts
+++ b/chrome/browser/resources/signin/profile_picker/profile_card.html.ts
@@ -10,7 +10,7 @@ import {isGlicVersion} from './profile_picker_flags.js';
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts
index 374234197329703c74f324719af39e4d1844b738..478ecd6bba594c104c871342ee22574a49de176f 100644
index 9130ae3712b6f4a0934077b3ae652d5d2da2bff5..216df04e561aa212b7b1b2ef174633109b050c04 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts
+++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts
@@ -26,7 +26,7 @@ export function getHtml(this: ProfilePickerMainViewElement) {
@@ -34,7 +34,7 @@ ${function() {
data-index="${index}">
</profile-card>
`)}
@@ -1,5 +1,5 @@
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 fd91dc6690da03a40fb0fb188f3759df9982d954..e0f1177bf131126b5124d654996834199aa346d8 100644
index 2f2c5f36662e56868f5aec7ce0dac1ecc3d90480..aaef7795313eba80271080aae3a6976d7cd82577 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
@@ -109,6 +109,7 @@ export class ProfilePickerMainViewElement extends
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
index bc64aa588acd6600486bbdd8aea60230aa742a73..694a1d42d0e2c36739782053a7d1d2de61e34b39 100644
index cc78cae835a158da2ecbbbe6d3be84e2a0736f59..d14e899324ab43e701d00e864d030c294dc6514c 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
@@ -326,6 +326,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt(
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index ecddd5434f7259aacc22befca9faae84e2e6e3ac..fc405eb7b4077cc3d297c16bb6360a74fd6702f8 100644
index 0e5585a0faa149e2bd3a755efcd4dcd2907bff96..405e408cff2fda01c17ed76d79cb2f45ac21d9d4 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -373,6 +373,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) {
@@ -345,6 +345,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) {
window_id) == window_closing_ids_.end()) &&
IsOnlyOneTabLeft()) {
// This is the last tab in the last tabbed browser.
@@ -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 193a542384e0b4e0f19f35cf244753b6a6f88dbb..299d27a8c4125628e2ac3b0841a1ba69d851f95c 100644
index cc676d3c1b201ccdf5138b1135b8fab9bf7a48da..f298bc8d1662b23215ce235eb9a2ab15abcc8a87 100644
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
@@ -186,6 +186,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
index f9b7f46e2ddf7c00074f23c674b92149d224cc3f..db4a8d407f10402f9bc18070b867528901a0b85d 100644
index 847f9fcbb2c0bd2d0139c1a9d34c86e997c3d2c8..833cef1e0b2cf80a5d712c994b56c3a63db81873 100644
--- a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
+++ b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
@@ -448,6 +448,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial(
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
index fc1dd87dcb48d1b45e99b60c73036f8c8f6b30a4..5bd53d375c199d9728f98c23cf046f0cd6d089f6 100644
index 6378be21fcb9afad1e24f8c628e14fba13816a23..760cb20588728feacd37780c06b79d2f81688a68 100644
--- a/chrome/browser/sync/sync_service_factory.cc
+++ b/chrome/browser/sync/sync_service_factory.cc
@@ -410,7 +410,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
@@ -408,7 +408,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
}
auto sync_service =
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/tab_ui/android/BUILD.gn b/chrome/browser/tab_ui/android/BUILD.gn
index c35022e35ca28c695a7115e48f67a8288efe3504..63724eb23551df9709a7d74dbb98b3c0c767d9b9 100644
index b070e2cdc2a53fd9deb18fbb1a2c8a0edcc26130..aa2a08256773bac27d153e96e37982e64ded3c98 100644
--- a/chrome/browser/tab_ui/android/BUILD.gn
+++ b/chrome/browser/tab_ui/android/BUILD.gn
@@ -23,6 +23,7 @@ android_library("java") {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
index 7a08fccfb093aa06c22965646c34998cc0ca3722..ca77a3337ef062dd63e856e17d5e37fa165b7e24 100644
index 1809d9f6aff5bd3db8c354f25d09bec6c92c1c5d..3d2c56ca5cd21047eb2308643fe8cf5c4f1aa30d 100644
--- a/chrome/browser/themes/theme_service_factory.cc
+++ b/chrome/browser/themes/theme_service_factory.cc
@@ -109,6 +109,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
@@ -103,6 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
std::unique_ptr<KeyedService>
ThemeServiceFactory::BuildServiceInstanceForBrowserContext(
content::BrowserContext* profile) const {
+4 -4
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 0f555f49aa931665103835ef89e07dbabdb11ab2..5fb8d2dcbda78d7ab84e57ce78c178d25d11f737 100644
index 0ed6e9e4343507f0a343423b49c8bb76d585b785..635afd0380ba88b7950a478d2170852345d758fc 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -749,6 +749,7 @@ static_library("ui") {
@@ -750,6 +750,7 @@ static_library("ui") {
"//chrome/browser/task_manager:impl",
]
@@ -10,7 +10,7 @@ index 0f555f49aa931665103835ef89e07dbabdb11ab2..5fb8d2dcbda78d7ab84e57ce78c178d2
if (enable_vr && is_win) {
deps += [ "//chrome/browser/vr:vr_base" ]
@@ -3521,7 +3522,10 @@ static_library("ui") {
@@ -3525,7 +3526,10 @@ static_library("ui") {
]
deps += [ "//chrome/updater/app/server/win:updater_legacy_idl" ]
} else {
@@ -22,7 +22,7 @@ index 0f555f49aa931665103835ef89e07dbabdb11ab2..5fb8d2dcbda78d7ab84e57ce78c178d2
}
}
@@ -5691,6 +5695,7 @@ static_library("ui_public_dependencies") {
@@ -5698,6 +5702,7 @@ static_library("ui_public_dependencies") {
if (enable_extensions_core) {
public_deps += [ "//extensions/browser" ]
}
@@ -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 2c5dd5e858ea308538b455c1a81e79a0554df11e..5f2efedb5d01fc9efd674e77830621ddfa556550 100644
index 99d3b60c63ef1a2953ce54ca53d9c244339a15b9..b0b277903b94058a898052ea748f0aa3be4ad457 100644
--- a/chrome/browser/ui/actions/chrome_action_id.h
+++ b/chrome/browser/ui/actions/chrome_action_id.h
@@ -516,6 +516,7 @@
@@ -519,6 +519,7 @@
/* Side Panel items */ \
E(kActionSidePanelShowAboutThisSite) \
E(kActionSidePanelShowAssistant) \
@@ -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 accdb1bb07689bc67aeca25feef87966fbe7c0aa..eb056358404e300204c33dda59bf8d02b02cc213 100644
index a594389eecd822f596366f9dc789c72033c38c6c..a758a1b161a2d77e19a03463c8c1b3cd1e513641 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
@@ -311,6 +311,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
@@ -325,6 +325,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
anchorView,
groupDividerResourceId,
anchorViewOffset);
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
index 0821dc773877f3770b3cfe8fe15f394429b518a5..a958a4f8c83d1f00a20b786f3137e9e6270afef9 100644
index 416fda957889204f959f2d7209db67913538f4af..a74aed2bd2288f1127edc24b841c1bc73180f6d3 100644
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -112,6 +112,7 @@ android_library("java") {
@@ -113,6 +113,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/StripVisibilityState.java",
"java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java",
]
@@ -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 c16bbdce2b2a3f8568934a4f40a00d8497f3f696..241b69ee53cdac5b5bab20d6dc04dacd5fa86a8e 100644
index 4caa95def3fe8153a68d5b56d7a9171dfcb58698..5c952442fa6811448fe4927240f9bc14582fae67 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
@@ -38,6 +38,7 @@ found in the LICENSE file.
@@ -39,6 +39,7 @@ found in the LICENSE file.
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -10,7 +10,7 @@ index c16bbdce2b2a3f8568934a4f40a00d8497f3f696..241b69ee53cdac5b5bab20d6dc04dacd
android:layout_gravity="top|end"
android:focusable="true"
android:focusableInTouchMode="true">
@@ -50,6 +51,7 @@ found in the LICENSE file.
@@ -51,6 +52,7 @@ found in the LICENSE file.
android:layout_width="52dp"
style="@style/ToolbarHoverableButton" />
@@ -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 881c37afecc5a4b75515c7b76dc9d567921669e1..60a06fd31a65048b5f9f0f02f401a308737e9438 100644
index 0992c2793168a99aa301d72e28348864120cae67..5922e6e887a2134acd04604c072c4dbcd3b2c7db 100644
--- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
+++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
@@ -66,6 +66,7 @@ found in the LICENSE file.
@@ -70,6 +70,7 @@ found in the LICENSE file.
android:layout_gravity="center_vertical"
android:background="@drawable/modern_toolbar_tablet_text_box_background"
android:paddingEnd="@dimen/location_bar_end_padding" />
@@ -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 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc39159092d03e32 100644
index c4280a266e1cabf33036a705d6a81c64e428e329..ebc7f2d95857883a3a957f4e4d121c18bb606d8b 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
@@ -433,6 +433,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -425,6 +425,7 @@ public class ToolbarPhone extends ToolbarLayout
if (mOptionalButtonCoordinator != null) {
mOptionalButtonCoordinator.setBackgroundColorFilter(color);
}
@@ -10,7 +10,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590
}
private void updateModernLocationBarCorners() {
@@ -589,6 +590,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -581,6 +582,7 @@ public class ToolbarPhone extends ToolbarLayout
mTrackerSupplier.get().notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
}
}
@@ -18,7 +18,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590
}
@Override
@@ -1082,6 +1084,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -1032,6 +1034,7 @@ public class ToolbarPhone extends ToolbarLayout
* Tab Page.
*/
private void updateLocationBarLayoutForExpansionAnimation() {
@@ -26,7 +26,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590
TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
if (isInTabSwitcherMode()) return;
@@ -1469,6 +1472,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -1409,6 +1412,7 @@ public class ToolbarPhone extends ToolbarLayout
canvas.restore();
}
@@ -34,7 +34,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590
// Draw the tab stack button and associated text if necessary.
if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) {
// Draw the tab stack button image.
@@ -2126,6 +2130,7 @@ public class ToolbarPhone extends ToolbarLayout
@@ -2057,6 +2061,7 @@ public class ToolbarPhone extends ToolbarLayout
} else {
populateUrlClearExpansionAnimatorSet(animators);
}
@@ -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 7cf04251bcd3c0e4ed78718cc94c6a77851958b7..bb1ee5accb1a872b7b179b331158fc25fdb5445d 100644
index d434ff189bff1cced4e8fda2779892387e8823de..6234ab83b99d244d87b0931ec013a48be9c460f9 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
@@ -403,10 +403,12 @@ public class ToolbarTablet extends ToolbarLayout
@@ -383,10 +383,12 @@ public class ToolbarTablet extends ToolbarLayout
mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab());
RecordUserAction.record("MobileToolbarDownloadPage");
}
@@ -15,7 +15,7 @@ index 7cf04251bcd3c0e4ed78718cc94c6a77851958b7..bb1ee5accb1a872b7b179b331158fc25
String description = null;
Context context = getContext();
Resources resources = context.getResources();
@@ -546,6 +548,7 @@ public class ToolbarTablet extends ToolbarLayout
@@ -526,6 +528,7 @@ public class ToolbarTablet extends ToolbarLayout
mLocationBar.getTabletCoordinator().tintBackground(textBoxColor);
mLocationBar.updateVisualsForState();
setToolbarHairlineColor(color);
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3d0ffcbb38c234b97fe8df33e34eab5386bd59b8..57f3ea6f9e33aef1fc9f6aec3818263d3a709da6 100644
index fafd84d08e33622aee01f1792c043180a13dd48d..8773ecb93e5a7c999a13e46b9327657d852f7196 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -555,6 +555,7 @@ Browser* Browser::Create(const CreateParams& params) {
@@ -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 c69321daaa50b2025571e084e32daab081d854f2..88ceb225a9b7b8a050bcf7cbaa1c21ac34bd937e 100644
index 467c4b29931b3ed8bacd76db9b4a760c4df2a107..73742f09a415c3f4afc6bdd90bef996eebd80c9d 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
@@ -23,7 +23,7 @@ class GURL;
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index 2d39a00a308eff3c2b631f43637b00d6b6abb8f6..9858402af17d3d8f361b91652122aed2a54453d8 100644
index 605c712f3d182c60c4b347cdf54523d5c037a98f..f2bf932e44d11970f71ea06fc9eed222226d70de 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -772,4 +772,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -787,4 +787,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,5 +1,5 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 25af8060653c590a2c56213d2984f1a00a3d36e7..e22a6f2b50c06730e05021f7d51611141b8f9cc3 100644
index c9758f16912b31d41215bf49e5dfd49c2965c987..ce1995b0ae6fc92e1719f46e8cf138ed902cd51c 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -869,6 +869,7 @@ void BookmarkBarView::Layout(PassKey) {
@@ -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 60672a6fd4fffb7013cc894b6bd9362fc224da38..e4b58dc622cff04dc7d3e2bbc1d91a45ea96c0df 100644
index b3c3d1f001f5cb90096ea82e7bc818af8f26093a..5b1b584ff07c97711eb7d1ebf1f1b39cfe1ce332 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -449,6 +449,7 @@ void BookmarkBubbleView::ShowBubble(
@@ -440,6 +440,7 @@ void BookmarkBubbleView::ShowBubble(views::View* anchor_view,
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/extensions/extensions_menu_main_page_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc
index 9119f90e636cfce180128076eba1e7d104c24f80..2307c42a224cb513ca51369c157f33c8ecfd2ba4 100644
index 62778c9ebe4d344a82707ea65651d4a66e474766..22b1779b7bfed94694e041b75e2a634bb535f1f5 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
@@ -216,6 +216,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem(
@@ -217,6 +217,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem(
ExtensionMenuItemView::SitePermissionsButtonAccess
site_permissions_button_access,
int index) {
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 46f6be18ac556ef42c5f40c7bca792c156eafac9..b8bce345f82be29f0a76d617936fcb2bfe9484b0 100644
index 39f9345a8bf6a9cf28343a3706de734013452ec6..e890b6bf251abcfef00aca944ef961cb44977b66 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -72,6 +72,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) {
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view.h b/chrome/browser/ui/views/frame/tab_strip_region_view.h
index 62662c70ae6d83be51bc9a6ade27d8b240e80d78..f5cbd6940b255b71b789680d60f925e7c1e31b14 100644
index bca3cc6c4fd27b5c1264778ff38f8dd43ac32ff1..9d4bbaf888b474705b581f977acb0cb7b9a2a638 100644
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.h
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.h
@@ -29,7 +29,7 @@ class TabSearchPositionMetricsLogger;
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index 7f9528294463ce8a730e2ce92ed53d19976de7b2..fdb6ed767072bc4333696bbe375854dd7b234e9b 100644
index 5067e96c2701a7fdf35099070478b4825feccff9..b150841ce0bb18ef5e5ce0da2f2884ccd38507ba 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -748,6 +748,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
@@ -749,6 +749,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const {
SkIntToScalar(radii.lower_right()), SkIntToScalar(radii.lower_right()),
SkIntToScalar(radii.lower_left()), SkIntToScalar(radii.lower_left())};
@@ -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 a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba8d71f89d 100644
index 22e9b1938429f86c617c8ba59d9e3edb988cb11e..839ad1d1c236bee117fe673c3510518f4257bafe 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -771,6 +771,7 @@ void LocationBarView::Layout(PassKey) {
@@ -773,6 +773,7 @@ void LocationBarView::Layout(PassKey) {
// Indentation add padding when the permission chip is visible and replacing
// the LHS icon.
int text_overriding_permission_chip_indent = 0;
@@ -10,7 +10,7 @@ index a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba
if (should_indent) {
icon_left += icon_indent;
text_left += text_indent;
@@ -835,6 +836,7 @@ void LocationBarView::Layout(PassKey) {
@@ -845,6 +846,7 @@ void LocationBarView::Layout(PassKey) {
}
selected_keyword_view_->SetCustomImage(image);
}
@@ -18,7 +18,7 @@ index a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba
} else if (location_icon_view_->GetShowText() &&
!ShouldChipOverrideLocationIcon()) {
location_icon_view_->SetVisible(true);
@@ -882,6 +884,7 @@ void LocationBarView::Layout(PassKey) {
@@ -892,6 +894,7 @@ void LocationBarView::Layout(PassKey) {
}
};
@@ -26,7 +26,7 @@ index a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba
add_trailing_decoration(page_action_icon_container_,
/*intra_item_padding=*/0);
add_trailing_decoration(page_action_container_,
@@ -897,6 +900,7 @@ void LocationBarView::Layout(PassKey) {
@@ -907,6 +910,7 @@ void LocationBarView::Layout(PassKey) {
}
add_trailing_decoration(clear_all_button_, /*intra_item_padding=*/0);
@@ -1,8 +1,8 @@
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 f60a77c61182278ffa581b5bfbdc6adf7e7b86b0..2ed902249eeb7e929152b298c3a265036b56eec2 100644
index 45ce3e2833ead125c1e9f3f91ea2a66e9f15b0b3..8fa1910c4a47de350bd63ef8835ce2a07e0b3ac9 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -128,6 +128,7 @@ class LocationBarView
@@ -129,6 +129,7 @@ class LocationBarView
int GetBorderRadius() const;
// Initializes the LocationBarView.
@@ -10,7 +10,7 @@ index f60a77c61182278ffa581b5bfbdc6adf7e7b86b0..2ed902249eeb7e929152b298c3a26503
void Init();
// True if this instance has been initialized by calling Init, which can only
@@ -189,6 +190,7 @@ class LocationBarView
@@ -190,6 +191,7 @@ class LocationBarView
// Updates the controller, and, if |contents| is non-null, restores saved
// state that the tab holds.
@@ -18,7 +18,7 @@ index f60a77c61182278ffa581b5bfbdc6adf7e7b86b0..2ed902249eeb7e929152b298c3a26503
void Update(content::WebContents* contents);
// Clears the location bar's state for |contents|.
@@ -288,6 +290,7 @@ class LocationBarView
@@ -289,6 +291,7 @@ class LocationBarView
GetContentSettingViewsForTest() {
return content_setting_views_;
}
@@ -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 d1bfeca48574c54dfa19cee5ba718d34ce2adc50..9e0aaec6d7b8e141aaf72c9376e159b7a7c1c1e3 100644
index 6671f304fc15221d18fa1be2c4f20368db518e59..0dc3521fa18ca326a6cc14c82c19876722bc8424 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -363,7 +363,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
@@ -1,5 +1,5 @@
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 0ab9b97b32807d78cb53c3f365e9e0aef4defa63..dc19dd7a0653d07fc09361d9c8fb972d976a1d56 100644
index b38d6049f7451e05e8b82fbb785374eaa0600304..f542d140e4d19c9bd271bd8138bd34dad5bbb7ba 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
@@ -466,6 +466,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
@@ -1,5 +1,5 @@
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 2f2b15301fdd112faab2837f91f4f5d2345e416c..97b411cffd7690ce512a7d3438099f6707329a05 100644
index 4af1b3933d65f412955fc0b37bd2068d53b490b4..98ac783753e245a197e267252bf7960048472cad 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
@@ -156,6 +156,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons(
@@ -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 188e19af3f741d092e1db201c61f014779a8b435..ae664865e7a7a1fd5be2bd4064b8e074e8d8310b 100644
index bd414791858d960c7a3b491ca4bb6c2590294c7f..04731af36f8c4f0c64803ceadb712644535f4dfb 100644
--- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
+++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
@@ -145,6 +145,7 @@ class AvatarToolbarButton : public ToolbarButton {
@@ -147,6 +147,7 @@ class AvatarToolbarButton : public ToolbarButton {
CreateScopedZeroDelayOverrideSigninPendingTextForTesting();
private:
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
index 32f0ff1a74ddbd4b5b5cff01c19f347af6f81271..562299f2d3e4f55ae85dd914a7e582c9b379bbce 100644
index 1be1c66ac0f3b958717f560d48a4e6d15d0a0a60..5cedfa2dd4df746a8f4ccc845acec3fc0461c2a7 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
@@ -232,6 +232,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
@@ -236,6 +236,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
void set_perform_menu_actions_for_testing(bool perform_menu_actions) {
perform_menu_actions_ = perform_menu_actions;
}
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
index 14820d9e776883cfb724291ba9882dbbceeace7d..4945952dd49b5170d3a42b8bd236d459a1677785 100644
index bbeaafba9f40e73001e4af3b0b36908f460880d3..8bc7f07a95f03c38326f94dc9b20088fff34871e 100644
--- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
+++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
@@ -56,7 +56,7 @@ class View;
@@ -57,7 +57,7 @@ class View;
// registry's active_entry() then global registry's. These values are reset when
// the side panel is closed and |last_active_global_entry_id_| is used to
// determine what entry is seen when the panel is reopened.
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index dcdf31f2c44f2fbb8dbe8ca37dd14d99f77fdfc0..bc518950bc467b29a67da8881f3a9966f19d0e35 100644
index 6d333df15831dc47a3cd9570fd33eed544437567..4f142d577c824579f84454f7f8a7b6a619723b2c 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -331,6 +331,7 @@ void Tab::Layout(PassKey) {
@@ -332,6 +332,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 dcdf31f2c44f2fbb8dbe8ca37dd14d99f77fdfc0..bc518950bc467b29a67da8881f3a9966
if (center_icon_) {
// When centering the favicon, the favicon is allowed to escape the normal
// contents rect.
@@ -430,6 +431,7 @@ void Tab::Layout(PassKey) {
@@ -431,6 +432,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 dcdf31f2c44f2fbb8dbe8ca37dd14d99f77fdfc0..bc518950bc467b29a67da8881f3a9966
} else if (showing_close_button_) {
// Allow the title to overlay the close button's empty border padding.
title_right = close_x - after_title_padding;
@@ -1151,6 +1153,7 @@ void Tab::UpdateIconVisibility() {
@@ -1162,6 +1164,7 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;
@@ -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 c1382281c430fc9de0c9da6c4698fabed9412d9d..af53148bae6590b387efbf797cdc7db5e72ecc7e 100644
index 19a3d6c2b98a5f08dc0330f84757a5c37328ff0e..64df85c4ea6e275b517bd6b34e9f2520ae65c331 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
@@ -91,6 +91,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 3cc13da526ba7f12dfaf8f6c923d4f084fd6dda4..b8d6af01d3a792df831d1e79ae5e71cdd9dd7a92 100644
index 51a239344ece084daaa83d7f1c48dd953a8d4eef..8278bec2bf2960be713301b86fbde70bee14df4d 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -541,6 +541,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
@@ -543,6 +543,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
std::vector<gfx::Rect> CalculateBoundsForDraggedViews(
const std::vector<raw_ptr<TabSlotView, VectorExperimental>>& views)
override {
@@ -10,7 +10,7 @@ index 3cc13da526ba7f12dfaf8f6c923d4f084fd6dda4..b8d6af01d3a792df831d1e79ae5e71cd
CHECK(!views.empty(), base::NotFatalUntil::M128)
<< "The views vector must not be empty.";
@@ -837,6 +838,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
@@ -839,6 +840,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
continue;
}
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc
index 13203a55591f2747729185ac763c00f59488da41..e8c7b632db8911d8511b36ba20ef5815411277a8 100644
index 29ff9c9f413cc2b73443fa274a826effbecd9bd8..2bcf16aa51628156893338916d49916cd28b70d9 100644
--- a/chrome/browser/ui/views/tabs/tab_style_views.cc
+++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -128,6 +128,7 @@ class TabStyleViewsImpl : public TabStyleViews {
@@ -127,6 +127,7 @@ class TabStyleViewsImpl : public TabStyleViews {
TabStyle::TabSelectionState GetSelectionState() const;
private:
@@ -10,7 +10,7 @@ index 13203a55591f2747729185ac763c00f59488da41..e8c7b632db8911d8511b36ba20ef5815
// Gets the bounds for the leading and trailing separators for a tab.
TabStyle::SeparatorBounds GetSeparatorBounds(float scale) const;
@@ -343,6 +344,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type,
@@ -339,6 +340,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type,
extension_corner_radius -= 0.5f * stroke_adjustment;
}
const bool compact_left_to_bottom = ShouldCompactLeadingEdge(path_type);
@@ -18,7 +18,7 @@ index 13203a55591f2747729185ac763c00f59488da41..e8c7b632db8911d8511b36ba20ef5815
SkPath path;
@@ -1018,14 +1020,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const {
@@ -1003,14 +1005,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const {
SK_AlphaOPAQUE));
};
@@ -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 27efd0c4238f4eb39c16b51338bd3d7aa62e64b4..2425386e9b90b03ca4b4bdc62c48f8f02214aa40 100644
index 0d912a7cbf371458a6997c1362a44265698f2541..4f83fd13e9e55feae4adc80b13b1428933f00b2d 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -481,6 +481,7 @@ void ToolbarView::Init() {
@@ -467,6 +467,7 @@ void ToolbarView::Init() {
container_view_->AddChildView(std::move(send_tab_to_self_button));
}
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn
index ee8a22c4514de2b356933fa2a9764a1799cfeaa5..3c9ce7b5bb2d3084b0a3631e84dada2ac3b4a5c2 100644
index f5e62acbe488bbf758d0084ae3fca7ef05595a13..63ac37a30dc9d0b6e35d238fd77885643b9bafef 100644
--- a/chrome/browser/ui/webui/BUILD.gn
+++ b/chrome/browser/ui/webui/BUILD.gn
@@ -74,6 +74,7 @@ source_set("configs") {
@@ -78,6 +78,7 @@ source_set("configs") {
if (enable_glic) {
deps += [ "//chrome/browser/glic" ]
}
@@ -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 af4d850908f905d3db8b2c58df16bdfbdf3e5017..6a9804e2f0db1c7da8178a3786cf7a4308f84443 100644
index e4dd0d8a793f279c6ac1ffc546ae4af6ec44840f..d4f64128e9982b02135dcad9be5f433543d75aa6 100644
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -502,6 +502,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
@@ -501,6 +501,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME)));
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc
index fdbd1e679be1687b430c00f9aa638ea67768fcf1..148672cb5c0adf7706efde79919322fc82f31a7e 100644
index f84d35ce8e4646143216dbd28e5c685fcac711eb..dc4b6c0b9213c9476bc4ce4ec266f5bef64823f8 100644
--- a/chrome/browser/ui/webui/history/history_ui.cc
+++ b/chrome/browser/ui/webui/history/history_ui.cc
@@ -89,6 +89,7 @@ content::WebUIDataSource* CreateAndAddHistoryUIHTMLSource(Profile* profile) {

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