Update patches from Chromium 145.0.7632.120 to Chromium 146.0.7680.32.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
||||
index 2c08275379c5586d5ba02634d37ad52505c7d6a7..674bafbad02e1047b2efa0ddbab980749132151e 100644
|
||||
index d0317b2920ca8b545d3294d6121aa0085969ab0b..d6fcb16256402dbb67ea99df82296a001e4d38b9 100644
|
||||
--- a/base/BUILD.gn
|
||||
+++ b/base/BUILD.gn
|
||||
@@ -4786,6 +4786,7 @@ if (is_android) {
|
||||
@@ -4818,6 +4818,7 @@ if (is_android) {
|
||||
"android/java/src/org/chromium/base/UserDataHost.java",
|
||||
"android/java/src/org/chromium/base/ValueChangedCallback.java",
|
||||
]
|
||||
@@ -10,7 +10,7 @@ index 2c08275379c5586d5ba02634d37ad52505c7d6a7..674bafbad02e1047b2efa0ddbab98074
|
||||
|
||||
resources_package = "org.chromium.base"
|
||||
|
||||
@@ -5442,6 +5443,7 @@ if (is_android) {
|
||||
@@ -5474,6 +5475,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 9c0912d6314af55d31eca30e16c57b84400e0e5a..969577a42696ac3a19cddb49c13894ca506b637c 100644
|
||||
index 1fe7e3f414b2f888ec6fc2ecd306c26144719ddb..d37692dfbd363bda93c39e6d3367487c19510aaf 100644
|
||||
--- a/base/metrics/histogram_functions.h
|
||||
+++ b/base/metrics/histogram_functions.h
|
||||
@@ -82,6 +82,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc
|
||||
index 760f0982cf35b9294cb916da82e7b39aa522142c..06642daac8a193e476279413fe35555a5e85e0b0 100644
|
||||
index 6970688273a878711870c85dafcfffd49b373381..238e2f2969d0ca06d04809977d9618ec78bcda6d 100644
|
||||
--- a/base/test/launcher/test_results_tracker.cc
|
||||
+++ b/base/test/launcher/test_results_tracker.cc
|
||||
@@ -304,6 +304,7 @@ TestResultsTracker::~TestResultsTracker() {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
|
||||
index 6f000c21239c85de00733ccaef02feeabdf994de..bef7dcc2bd333dde8e796c1d7a578463e17f36fe 100644
|
||||
index b53745dd0a4011fb15ab16d61f9a6effd5c03598..934771aa66492bed993017a3eb5a98fd8660230b 100644
|
||||
--- a/base/threading/thread_restrictions.h
|
||||
+++ b/base/threading/thread_restrictions.h
|
||||
@@ -735,6 +735,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
|
||||
@@ -738,6 +738,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 8649b24d17fc9d8acf988f44422134ecc3ed0203..9f81140cfc2993fb69e42365b0b032e659bf8979 100644
|
||||
index 56408734b26428933a1fb8c04cee317c659feea7..4a60b4244fdc821c71aa8a9b19bd8619cf45458e 100644
|
||||
--- a/base/trace_event/builtin_categories.h
|
||||
+++ b/base/trace_event/builtin_categories.h
|
||||
@@ -277,6 +277,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
|
||||
@@ -279,6 +279,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
|
||||
perfetto::Category("webrtc").SetTags("audio", "video"),
|
||||
perfetto::Category("webrtc_stats"),
|
||||
perfetto::Category("xr"),
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py
|
||||
index 5e1eec5fd80984a25681550633829d494a5fa517..665bc9a50a4fed1cd9b5d07dfb36a1565698f40c 100755
|
||||
index e1303b834c37101025f7dfa64916f62ae54c4cd1..7f4cd75e7af7bba1c2f7970e406ef6ea9c2ff1db 100755
|
||||
--- a/build/android/gradle/generate_gradle.py
|
||||
+++ b/build/android/gradle/generate_gradle.py
|
||||
@@ -913,5 +913,6 @@ def main():
|
||||
@@ -918,5 +918,6 @@ def main():
|
||||
'+/main/docs/android_studio.md')
|
||||
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/android/gyp/create_app_bundle.py b/build/android/gyp/create_app_bundle.py
|
||||
index 4d26b56be2995bb8e1c1ff4c28fa501e6e128ead..a0909e8ec6d0ef9fc43a2e27e82fffbb15ab6d98 100755
|
||||
index 3f3d75d490e30904b970c6ef3312572c9483b037..6c011b1eedb922f7841358b98b6b92b235b318de 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',
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
|
||||
index 4d5c8f777245672cb0620fbbdb463cd3904c8ee9..312d893746bc4ae573a52adb77fb2889dfc4c794 100755
|
||||
index ebe275036e26094ebe6ef0a6008db6dce46fbe6f..c359471eeb77ed95db9891726fab5a71419cfbd2 100755
|
||||
--- a/build/android/gyp/proguard.py
|
||||
+++ b/build/android/gyp/proguard.py
|
||||
@@ -394,6 +394,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
|
||||
@@ -393,6 +393,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data):
|
||||
'--pg-map-output',
|
||||
tmp_mapping_path,
|
||||
]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/build/android/gyp/util/resource_utils.py b/build/android/gyp/util/resource_utils.py
|
||||
index 4e32b6c997055ab8f793babeca32640f86469058..993320e8b49faf1c14584298177d776613d42aba 100644
|
||||
index 79df90b8aeb4e56844f1a493ffa74c9eba06b743..82f696ef4380ff548dff84694aaedb0d790016f6 100644
|
||||
--- a/build/android/gyp/util/resource_utils.py
|
||||
+++ b/build/android/gyp/util/resource_utils.py
|
||||
@@ -256,6 +256,7 @@ class ResourceInfoFile:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
|
||||
index b7ce0bc9abe0f5e39383f8f57f9c531e0d068093..515ba4c01db326b98073d9534ca577757965003f 100644
|
||||
index b6f0e2a387e32aaebdaadffe577cd78cdfe4eb72..7e710e7422870c2c4ee5cc6d89e556bfcd52b92b 100644
|
||||
--- a/build/android/pylib/gtest/gtest_test_instance.py
|
||||
+++ b/build/android/pylib/gtest/gtest_test_instance.py
|
||||
@@ -731,3 +731,4 @@ class GtestTestInstance(test_instance.TestInstance):
|
||||
@@ -742,3 +742,4 @@ class GtestTestInstance(test_instance.TestInstance):
|
||||
if self._deobfuscator:
|
||||
self._deobfuscator.Close()
|
||||
self._deobfuscator = None
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
|
||||
index 38719796a381e2dcf22782693f458b6750d2670f..6a8f9f0bcd74013739f09e94364a6511f64a892b 100644
|
||||
index 4174baa9c0e39b517ade66aab07123eaf9b58e47..6ac15e59c566a7721193f4dc7349b20fadf36a7e 100644
|
||||
--- a/build/config/BUILDCONFIG.gn
|
||||
+++ b/build/config/BUILDCONFIG.gn
|
||||
@@ -343,6 +343,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 516462806f693429aefce3f0e7cfe65cf22f180c..d0b0a7421eaee0f2541ab5f32c4b6b5e2e5801ab 100644
|
||||
index cc12ce785a97775955ec26d1821688b9bb48fce0..199be21a8ca00c625af4c8c0b031472e81664202 100644
|
||||
--- a/build/config/android/config.gni
|
||||
+++ b/build/config/android/config.gni
|
||||
@@ -28,6 +28,7 @@ assert(!(incremental_install && !is_java_debug),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
||||
index 802d68ced433e41c7bad5a7bd2ba2645bf347b70..789e9138eb001c98d36ba18b7b65dbd20a70e199 100644
|
||||
index b047ff19a3e8df53af9cc45d99e8ea8b82ea4f0a..bd5c6570e38f21cdfd4d89519fa7eaa60e7d42e7 100644
|
||||
--- a/build/config/android/internal_rules.gni
|
||||
+++ b/build/config/android/internal_rules.gni
|
||||
@@ -3657,6 +3657,7 @@ if (enable_java_templates) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
|
||||
index caa35daa9944b99aee82cae1cf8042262b8cdb86..b0fc3bce0fc0d40be8f38607f74fdfd67fed7310 100644
|
||||
index cd213c57051d1780eb42a320ab25fb5c0b3956bf..65c9f59bb03dc2a16c2a7d03434154942c78b17a 100644
|
||||
--- a/build/config/android/rules.gni
|
||||
+++ b/build/config/android/rules.gni
|
||||
@@ -208,6 +208,7 @@ if (!is_robolectric && enable_java_templates) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/config/siso/main.star b/build/config/siso/main.star
|
||||
index 34bb20173df31840d95ff57bafd4efb63b3d5010..567ae154c4a42e44ee8ec2a947e2756b885d06da 100644
|
||||
index f72e5f86f923b136034ebe5a46cb7d6588ccd70f..fdf8a614ee3acda31140b589bcf928829dffcb41 100644
|
||||
--- a/build/config/siso/main.star
|
||||
+++ b/build/config/siso/main.star
|
||||
@@ -20,6 +20,7 @@ load("./reproxy.star", "reproxy")
|
||||
@@ -21,6 +21,7 @@ load("./reproxy.star", "reproxy")
|
||||
load("./rust.star", "rust")
|
||||
load("./simple.star", "simple")
|
||||
load("./windows.star", chromium_windows = "chromium")
|
||||
@@ -10,7 +10,7 @@ index 34bb20173df31840d95ff57bafd4efb63b3d5010..567ae154c4a42e44ee8ec2a947e2756b
|
||||
|
||||
def __disable_remote(ctx, step_config):
|
||||
gn_logs_data = gn_logs.read(ctx)
|
||||
@@ -103,6 +104,7 @@ def init(ctx):
|
||||
@@ -85,6 +86,7 @@ def init(ctx):
|
||||
handlers.update(simple.handlers)
|
||||
handlers.update(reproxy.handlers)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/config/unsafe_buffers_paths.txt b/build/config/unsafe_buffers_paths.txt
|
||||
index 62db5eb3f46b8c4b93725c2a0e24472259bf967e..0f75b65285bf116ba46359f646864e46a140eac5 100644
|
||||
index ec12fe9208233cf9f2c26921f1171ca5e4abe893..da45db4fd5ca0f91809776a54a904a0c3b5f25be 100644
|
||||
--- a/build/config/unsafe_buffers_paths.txt
|
||||
+++ b/build/config/unsafe_buffers_paths.txt
|
||||
@@ -30,3 +30,10 @@ $../../
|
||||
@@ -31,3 +31,10 @@ $../../
|
||||
+third_party/liburlpattern/
|
||||
-tools/
|
||||
-v8/
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
|
||||
index 70f99056769ed2a72fcfdd5b00be4607b2faddb0..cadbe1927bfd8914c7b79a59adfd2b7e944bec96 100644
|
||||
index a993149fa6467acf67a43a34a3fd843edabffafa..87d09c26466618c61ae1596fbfab535959d9f45a 100644
|
||||
--- a/build/rust/cargo_crate.gni
|
||||
+++ b/build/rust/cargo_crate.gni
|
||||
@@ -180,6 +180,7 @@ template("cargo_crate") {
|
||||
@@ -181,6 +181,7 @@ template("cargo_crate") {
|
||||
manifest_dir = rebase_path(build_gn_dir + "/crate", root_build_dir)
|
||||
}
|
||||
_rustenv += [ "CARGO_MANIFEST_DIR=${manifest_dir}" ]
|
||||
@@ -10,7 +10,7 @@ index 70f99056769ed2a72fcfdd5b00be4607b2faddb0..cadbe1927bfd8914c7b79a59adfd2b7e
|
||||
|
||||
# cargo_crate() should set library_configs, executable_configs,
|
||||
# proc_macro_configs. Not configs.
|
||||
@@ -272,6 +273,7 @@ template("cargo_crate") {
|
||||
@@ -273,6 +274,7 @@ template("cargo_crate") {
|
||||
testonly = _testonly
|
||||
if (defined(invoker.visibility)) {
|
||||
visibility = invoker.visibility
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
||||
index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61a6367ad0 100644
|
||||
index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8ff09a048 100644
|
||||
--- a/chrome/BUILD.gn
|
||||
+++ b/chrome/BUILD.gn
|
||||
@@ -195,6 +195,7 @@ if (!is_android && !is_mac) {
|
||||
@@ -10,7 +10,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
|
||||
deps += [
|
||||
":chrome_dll",
|
||||
@@ -500,11 +501,12 @@ if (is_win) {
|
||||
@@ -499,11 +500,12 @@ if (is_win) {
|
||||
args += [ "--keystone=0" ]
|
||||
}
|
||||
}
|
||||
@@ -24,7 +24,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
extra_substitutions = [
|
||||
"CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
|
||||
"CHROMIUM_SHORT_NAME=$chrome_product_short_name",
|
||||
@@ -524,6 +526,7 @@ if (is_win) {
|
||||
@@ -523,6 +525,7 @@ if (is_win) {
|
||||
"//chrome/common:buildflags",
|
||||
"//chrome/common:version_header",
|
||||
]
|
||||
@@ -32,7 +32,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
|
||||
if (enable_updater) {
|
||||
deps += [ ":chromium_updater_privileged_helper" ]
|
||||
@@ -669,6 +672,7 @@ if (is_win) {
|
||||
@@ -668,6 +671,7 @@ if (is_win) {
|
||||
# this dependency directly copies the file into the framework's
|
||||
# resources directory.
|
||||
public_deps += [ ":chrome_framework_widevine_signature" ]
|
||||
@@ -40,7 +40,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
}
|
||||
}
|
||||
|
||||
@@ -712,9 +716,11 @@ if (is_win) {
|
||||
@@ -711,9 +715,11 @@ if (is_win) {
|
||||
"--scm=0",
|
||||
]
|
||||
}
|
||||
@@ -52,7 +52,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
if (is_chrome_branded && include_branded_entitlements) {
|
||||
# These entitlements are bound to the official Google Chrome signing
|
||||
# certificate and will not necessarily work in any other build.
|
||||
@@ -739,6 +745,7 @@ if (is_win) {
|
||||
@@ -738,6 +744,7 @@ if (is_win) {
|
||||
info_plist_target = invoker.info_plist_target
|
||||
} else {
|
||||
info_plist_target = ":chrome_helper_plist"
|
||||
@@ -60,7 +60,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
}
|
||||
|
||||
extra_substitutions = [
|
||||
@@ -922,6 +929,7 @@ if (is_win) {
|
||||
@@ -921,6 +928,7 @@ if (is_win) {
|
||||
if (enable_updater) {
|
||||
if (is_chrome_branded) {
|
||||
sources += [ "//third_party/updater/chrome_mac_universal_prod/cipd/${updater_product_full_name}.app" ]
|
||||
@@ -68,7 +68,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
} else {
|
||||
sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
|
||||
|
||||
@@ -1208,6 +1216,7 @@ if (is_win) {
|
||||
@@ -1206,6 +1214,7 @@ if (is_win) {
|
||||
"-current_version",
|
||||
chrome_dylib_version,
|
||||
]
|
||||
@@ -76,7 +76,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
|
||||
if (!is_component_build) {
|
||||
# Specify a sensible install_name for static builds. The library is
|
||||
@@ -1405,6 +1414,7 @@ if (is_win) {
|
||||
@@ -1403,6 +1412,7 @@ if (is_win) {
|
||||
|
||||
group("dependencies") {
|
||||
public_deps = [
|
||||
@@ -84,7 +84,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
"//build:branding_buildflags",
|
||||
"//build:chromeos_buildflags",
|
||||
"//chrome/browser",
|
||||
@@ -1450,7 +1460,7 @@ group("dependencies") {
|
||||
@@ -1448,7 +1458,7 @@ group("dependencies") {
|
||||
|
||||
if (is_win) {
|
||||
process_version_rc_template("chrome_exe_version") {
|
||||
@@ -93,7 +93,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
output = "$target_gen_dir/chrome_exe_version.rc"
|
||||
}
|
||||
|
||||
@@ -1499,6 +1509,7 @@ group("resources") {
|
||||
@@ -1497,6 +1507,7 @@ group("resources") {
|
||||
"//chrome/browser:resources",
|
||||
"//chrome/common:resources",
|
||||
"//chrome/renderer:resources",
|
||||
@@ -101,7 +101,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1553,6 +1564,7 @@ if (!is_android) {
|
||||
@@ -1551,6 +1562,7 @@ if (!is_android) {
|
||||
if (enable_resource_allowlist_generation) {
|
||||
repack_allowlist = _chrome_resource_allowlist
|
||||
deps = [ ":resource_allowlist" ]
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770ba0260fb 100644
|
||||
index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d89686cd6 100644
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -162,6 +162,7 @@ if (_is_default_toolchain) {
|
||||
@@ -163,6 +163,7 @@ if (_is_default_toolchain) {
|
||||
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
|
||||
"java/res_chromium_base/values/channel_constants.xml",
|
||||
]
|
||||
@@ -10,7 +10,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
}
|
||||
|
||||
android_resources("chrome_app_java_resources") {
|
||||
@@ -263,6 +264,7 @@ if (_is_default_toolchain) {
|
||||
@@ -272,6 +273,7 @@ if (_is_default_toolchain) {
|
||||
if (enable_extensions_core) {
|
||||
deps += [ "//chrome/browser/ui/android/extensions:java_resources" ]
|
||||
}
|
||||
@@ -18,7 +18,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
}
|
||||
|
||||
android_resources("java_overlay_resources") {
|
||||
@@ -800,6 +802,7 @@ if (_is_default_toolchain) {
|
||||
@@ -813,6 +815,7 @@ if (_is_default_toolchain) {
|
||||
]
|
||||
|
||||
deps += feed_deps
|
||||
@@ -26,7 +26,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
|
||||
srcjar_deps = [
|
||||
":chrome_android_java_enums_srcjar",
|
||||
@@ -817,6 +820,7 @@ if (_is_default_toolchain) {
|
||||
@@ -830,6 +833,7 @@ if (_is_default_toolchain) {
|
||||
"//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
|
||||
"//components/touch_to_search/core/browser:quick_action_category_enum_javagen",
|
||||
]
|
||||
@@ -34,7 +34,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
|
||||
# From java_sources.gni.
|
||||
sources = chrome_java_sources
|
||||
@@ -950,6 +954,7 @@ if (_is_default_toolchain) {
|
||||
@@ -967,6 +971,7 @@ if (_is_default_toolchain) {
|
||||
# TODO(crbug.com/434123514): see if we can remove these stub targets.
|
||||
deps += [ "//chrome/browser/ui/android/extensions/windowing/stub:java" ]
|
||||
}
|
||||
@@ -42,7 +42,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
}
|
||||
|
||||
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
|
||||
@@ -1676,6 +1681,7 @@ if (_is_default_toolchain) {
|
||||
@@ -1719,6 +1724,7 @@ if (_is_default_toolchain) {
|
||||
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
|
||||
"java/res_chromium_base/values/channel_constants.xml",
|
||||
]
|
||||
@@ -50,7 +50,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
|
||||
# Dep needed to ensure override works properly.
|
||||
deps = [ ":chrome_base_module_resources" ]
|
||||
@@ -1828,6 +1834,7 @@ if (_is_default_toolchain) {
|
||||
@@ -1871,6 +1877,7 @@ if (_is_default_toolchain) {
|
||||
":${_variant}_locale_pak_assets",
|
||||
":${_variant}_paks",
|
||||
]
|
||||
@@ -58,7 +58,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2086,6 +2093,7 @@ if (_is_default_toolchain) {
|
||||
@@ -2129,6 +2136,7 @@ if (_is_default_toolchain) {
|
||||
"//third_party/androidx:androidx_annotation_annotation_experimental_java",
|
||||
"//third_party/androidx:androidx_browser_browser_java",
|
||||
]
|
||||
@@ -66,7 +66,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770
|
||||
|
||||
# More deps for DFMs.
|
||||
if (dfmify_dev_ui) {
|
||||
@@ -3064,6 +3072,7 @@ if (_is_default_toolchain) {
|
||||
@@ -3107,6 +3115,7 @@ if (_is_default_toolchain) {
|
||||
"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 e9985e19fc111d78ce9acd0dd8cf29bc6ab5ac2e..277a47b0273a897cd7a713be411767c47206f6da 100644
|
||||
index 7baeeaff95f804c51945e68a8a1e967260340a2c..ff67097dfc5b8571397b2a688983f3092fffcdf2 100644
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -1290,3 +1290,4 @@ if (enable_screen_capture) {
|
||||
@@ -1302,3 +1302,4 @@ if (enable_screen_capture) {
|
||||
"java/src/org/chromium/chrome/browser/media/MediaCapturePickerTabObserver.java",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
|
||||
index d079c147a169f57c7668057847c23d26ca3962f2..778327370536544fdbd8604e1bab534c921353a8 100644
|
||||
index 6bd4fc5504337705757f4f1e8683e5bcb8d4043a..ac7a59523f4312b4ba17cfaca77e0522bb7a2c82 100644
|
||||
--- a/chrome/android/chrome_public_apk_tmpl.gni
|
||||
+++ b/chrome/android/chrome_public_apk_tmpl.gni
|
||||
@@ -291,6 +291,7 @@ template("chrome_common_apk_or_module_tmpl") {
|
||||
@@ -18,7 +18,7 @@ index d079c147a169f57c7668057847c23d26ca3962f2..778327370536544fdbd8604e1bab534c
|
||||
if (_is_test) {
|
||||
proguard_configs += [ "//chrome/android/proguard/apk_for_test.flags" ]
|
||||
}
|
||||
@@ -665,6 +667,7 @@ template("chrome_common_apk_or_module_tmpl") {
|
||||
@@ -666,6 +668,7 @@ template("chrome_common_apk_or_module_tmpl") {
|
||||
"version_code",
|
||||
"version_name",
|
||||
])
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
|
||||
index a47da223c5a005ef631e9ff17197b02934998796..c2a0b31d9cd6a28020d371beccfa80cf9a33cc65 100644
|
||||
index 30b0a449fd2dafbd57ff053859621a07ca3ee5c6..ca59096b6b6a90d83cdc058d37c763fb5d3c3f8a 100644
|
||||
--- a/chrome/android/features/tab_ui/BUILD.gn
|
||||
+++ b/chrome/android/features/tab_ui/BUILD.gn
|
||||
@@ -132,6 +132,7 @@ android_resources("java_resources") {
|
||||
@@ -135,6 +135,7 @@ android_resources("java_resources") {
|
||||
"java/res/xml/tab_archive_time_delta_preference.xml",
|
||||
"java/res/xml/tabs_settings.xml",
|
||||
]
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
|
||||
index 7e5b4ff7d0d0ddd91cf0a01d3e4ecbe347fa27e7..fd1ed0584948c21c334691bc212116386a2d9e98 100644
|
||||
index 7d9d0d142300d1d2e2cdb13644b300550954b4ad..110890a4c2ff41ac9c2f1212718f298054c33c27 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
|
||||
@@ -402,7 +402,7 @@ public class FeedSurfaceMediator
|
||||
@@ -351,7 +351,7 @@ public class FeedSurfaceMediator
|
||||
// Start is showing, update the value of Pref.ENABLE_SNIPPETS_BY_DSE here. The
|
||||
// value should be updated before adding an observer to prevent an extra call of
|
||||
// updateContent().
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f239af76e4 100644
|
||||
index 1aef3a4966f4069890ad1be6265f9e48743b61e3..61aa5c7c9a230e6663c3a49a7fcdba8eb22056f6 100644
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
+++ b/chrome/android/java/AndroidManifest.xml
|
||||
@@ -38,6 +38,7 @@ by a child template that "extends" this file.
|
||||
@@ -80,7 +80,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2
|
||||
|
||||
<!-- Permission for using pinned windowing layer for document picture-in-picture. -->
|
||||
<uses-permission android:name="android.permission.USE_PINNED_WINDOWING_LAYER" />
|
||||
@@ -390,6 +405,7 @@ by a child template that "extends" this file.
|
||||
@@ -383,6 +398,7 @@ by a child template that "extends" this file.
|
||||
<intent-filter>
|
||||
<action android:name="com.sec.android.airview.HOVER" />
|
||||
</intent-filter>
|
||||
@@ -88,7 +88,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2
|
||||
<meta-data android:name="android.app.searchable"
|
||||
android:resource="@xml/searchable" />
|
||||
</activity-alias>
|
||||
@@ -932,6 +948,7 @@ by a child template that "extends" this file.
|
||||
@@ -925,6 +941,7 @@ by a child template that "extends" this file.
|
||||
</service>
|
||||
|
||||
<!-- Quick Action Search widget -->
|
||||
@@ -96,7 +96,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2
|
||||
<receiver
|
||||
android:name="org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch"
|
||||
android:label="@string/quick_action_search_widget_title"
|
||||
@@ -961,6 +978,7 @@ by a child template that "extends" this file.
|
||||
@@ -954,6 +971,7 @@ by a child template that "extends" this file.
|
||||
android:name="android.appwidget.provider"
|
||||
android:resource="@xml/quick_action_search_widget_dino_info" />
|
||||
</receiver>
|
||||
@@ -104,7 +104,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2
|
||||
|
||||
<!-- Bookmarks widget -->
|
||||
<receiver android:name="com.google.android.apps.chrome.appwidget.bookmarks.BookmarkThumbnailWidgetProvider"
|
||||
@@ -1180,7 +1198,7 @@ by a child template that "extends" this file.
|
||||
@@ -1170,7 +1188,7 @@ by a child template that "extends" this file.
|
||||
{% elif is_desktop_android == "true" %}
|
||||
android:foregroundServiceType="camera|microphone"
|
||||
{% elif enable_screen_capture == "true" %}
|
||||
@@ -113,7 +113,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2
|
||||
{% endif %}
|
||||
android:exported="false"/>
|
||||
<service android:name="org.chromium.chrome.browser.media.ui.ChromeMediaNotificationControllerServices$PlaybackListenerService"
|
||||
@@ -1275,6 +1293,7 @@ by a child template that "extends" this file.
|
||||
@@ -1265,6 +1283,7 @@ by a child template that "extends" this file.
|
||||
</activity>
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
|
||||
index 7b63c5ec2cb0ad7c32aa6110568e9c93553b3bf0..cb20eb415ea3dafa906f4b22b563575f46af0261 100644
|
||||
index 4a363158b6f437920665616f2cb9c91a0e6be27b..211be85e4955ac71fb8c11fcbf5d882034cebbd0 100644
|
||||
--- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml
|
||||
+++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
|
||||
@@ -150,6 +150,7 @@ found in the LICENSE file.
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
|
||||
index 389d8c42443aa58cdd779f44a52e817cd9983333..ced95a9d3107b17dda16a8363a7e6fe837199211 100644
|
||||
index 2599b098db6b4228643a868d5093373cb1787b9c..2cdfa16591649676865177458d4af8276e7c9e55 100644
|
||||
--- a/chrome/android/java/res/xml/main_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/main_preferences.xml
|
||||
@@ -61,7 +61,7 @@ found in the LICENSE file.
|
||||
@@ -64,7 +64,7 @@ found in the LICENSE file.
|
||||
android:key="autofill_section"
|
||||
android:order="11"
|
||||
android:title="@string/prefs_section_autofill"/>
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
index d19cc4f7c86a6d16b4a381dc925869110ce03bd0..a2bfb77d425139807b8c9d6beb2f66a458759a50 100644
|
||||
index ec155c488f20e31440fd97f6f99b0e23fc834129..f6806542dcdd0f0b0328b272d7a9aef293c96f49 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -872,6 +872,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
|
||||
@@ -887,6 +887,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
|
||||
private void closeIfNoTabsAndHomepageEnabled(
|
||||
boolean isPendingClosure, boolean shouldRemoveWindowWithZeroTabs) {
|
||||
if (getTabModelSelector().getTotalTabCount() == 0) {
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||||
index d2c52397fba2cd4b3bc3ab4eb156dfb5195c48c2..b94bd83645e17258fae73541da121c7b6e34ba22 100644
|
||||
index 0d0b4f241827a19fb267d035623ae0264a89bca3..fb4928ef36fa6ebfa36b4a8b881a595c6851e400 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||||
@@ -654,7 +654,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
||||
@@ -656,7 +656,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
||||
mBottomContainer = findViewById(R.id.bottom_container);
|
||||
|
||||
mSnackbarManager =
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
|
||||
index 80c8e02ac2c2c95a540878778adcfe80dae0eed6..e0596f56cd2f642c24f7efaef17ed8ccf5996df5 100644
|
||||
index 83188504d8feb30dfa05f8c7024c70295777e666..ef34be18ca5ffc9b3d5d0a8e24ce19564063060c 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
|
||||
@@ -354,7 +354,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
|
||||
@@ -356,7 +356,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
|
||||
}
|
||||
|
||||
/** Called when browsing data is about to be cleared. */
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
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 2fa43ec87b84fc96a6d2be96b582a6429d049f64..a197b54edafd8337f86fcd4be4811367ccfd5099 100644
|
||||
index 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c3547474516842 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
@@ -233,6 +233,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
|
||||
index 4349e1774109d2d71f6cdd4e0266ae64dbc3b989..0c49b29d2d7024d239eae2ff4a072fb7e95642d2 100644
|
||||
index 79ee74e12d1f40d1ea8665efaa3616d3ef82d77b..f538023a9f185638a8a64152ab21e88984b952b4 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
|
||||
@@ -319,6 +319,7 @@ public abstract class FullscreenHtmlApiHandlerBase
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java
|
||||
index d6f628c85406f22a3b739b839a6a8aa37733c803..fb5f1161c85d769c6091153f739814fa4f48ffc7 100644
|
||||
index 9c31fed21a20cc0ee6a871354cc3077945953111..d567a81855ddcb8a8abf102188ff44350a7cf150 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java
|
||||
@@ -86,6 +86,7 @@ public class InfoBarContainerView extends SwipableOverlayView
|
||||
|
||||
+2
-2
@@ -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 5f5dab6c7d871dc3faab39ca8ed34c5d8149e882..4e69b83092d63507a8a82e4da5d3dbd5023b8076 100644
|
||||
index 86d5ac08dffb657a040831656c2174e8748000a6..9a4fe5e006726ec7fda648d28e9b5aad9755ecfb 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
|
||||
@@ -146,7 +146,7 @@ public class NotificationPlatformBridge {
|
||||
@@ -11,7 +11,7 @@ index 5f5dab6c7d871dc3faab39ca8ed34c5d8149e882..4e69b83092d63507a8a82e4da5d3dbd5
|
||||
public final String notificationId;
|
||||
public final @NotificationType int notificationType;
|
||||
public final String origin;
|
||||
@@ -1034,7 +1034,7 @@ public class NotificationPlatformBridge {
|
||||
@@ -1033,7 +1033,7 @@ public class NotificationPlatformBridge {
|
||||
.storeNotificationResourcesIfSuspended(notification);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
|
||||
index 7d653f954e0660ab5eeb43d81c0400980490b66a..2b3c93bcbdc9a248bd7be4526fbe7ac78aa183f9 100644
|
||||
index 9f32ee8c94ee001a8e9dc2f3c30c4c413e72235f..f7daf168960a7e0ecf027530a8d9d71abe26da1b 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
|
||||
@@ -912,7 +912,7 @@ public class NewTabPage
|
||||
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
|
||||
index 333f2f0f020df62cf95210b20f63b637fd537183..55b315b35cd0b172e565dfb6c2b0905fc6e316cc 100644
|
||||
index 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fcb8f3c9be 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
|
||||
@@ -83,7 +83,7 @@ import java.util.function.Consumer;
|
||||
@@ -84,7 +84,7 @@ import java.util.function.Consumer;
|
||||
|
||||
/** Fragment to keep track of the all the privacy related preferences. */
|
||||
@NullMarked
|
||||
@@ -11,7 +11,7 @@ index 333f2f0f020df62cf95210b20f63b637fd537183..55b315b35cd0b172e565dfb6c2b0905f
|
||||
implements Preference.OnPreferenceChangeListener {
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_PRELOAD_PAGES = "preload_pages";
|
||||
@@ -551,6 +551,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -563,6 +563,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@Override
|
||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||
menu.clear();
|
||||
@@ -19,7 +19,7 @@ index 333f2f0f020df62cf95210b20f63b637fd537183..55b315b35cd0b172e565dfb6c2b0905f
|
||||
MenuItem help =
|
||||
menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
|
||||
help.setIcon(
|
||||
@@ -565,7 +566,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -577,7 +578,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
.show(getActivity(), getString(R.string.help_context_privacy), null);
|
||||
return true;
|
||||
}
|
||||
|
||||
+3
-3
@@ -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 1ce4feb6c019b6793629356dd474c77328eb06ac..9b59b72a40ef019cffecbd79fd404db9ea5e9962 100644
|
||||
index d9b6b3fe661d038cabe3675471c09f57341eb177..954dbe6b9aca2ec138954d5e69a96796fecbd9c2 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
|
||||
@@ -70,7 +70,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator;
|
||||
@@ -64,7 +64,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator;
|
||||
import org.chromium.chrome.browser.ui.signin.SigninUtils;
|
||||
import org.chromium.chrome.browser.ui.signin.SignoutButtonPreference;
|
||||
import org.chromium.chrome.browser.ui.signin.history_sync.HistorySyncHelper;
|
||||
@@ -11,7 +11,7 @@ index 1ce4feb6c019b6793629356dd474c77328eb06ac..9b59b72a40ef019cffecbd79fd404db9
|
||||
import org.chromium.components.browser_ui.settings.ChromeBasePreference;
|
||||
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
||||
import org.chromium.components.browser_ui.settings.SettingsUtils;
|
||||
@@ -724,6 +724,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
|
||||
@@ -626,6 +626,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
|
||||
*/
|
||||
private void updateSyncPreferences() {
|
||||
String signedInAccountName =
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
|
||||
index 39858b88c8c293bf067ac72fb88aa13749ead163..cd9c5c9853ac5248c734263688f3e7188469082c 100644
|
||||
index 07d70529c374ad81dda76864598d1d212a426d28..b1d1f17bb8ab387ecc791b57d1c30dc3f514ea4c 100644
|
||||
--- a/chrome/app/BUILD.gn
|
||||
+++ b/chrome/app/BUILD.gn
|
||||
@@ -88,6 +88,7 @@ grit_strings("generated_resources") {
|
||||
@@ -89,6 +89,7 @@ grit_strings("generated_resources") {
|
||||
if (is_android) {
|
||||
create_android_resources = true
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
index f524f646ce0373c73dd638e4db08decf0cceb69d..885ccd52c3d3815d31eb6874a878d7825179995d 100644
|
||||
index 2fc3a991d89093ff9139eb09d74123197155caff..d1142da6bc2dda793dd59d5f22438f9f2b565488 100644
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2618,6 +2618,7 @@ static_library("browser") {
|
||||
@@ -2599,6 +2599,7 @@ static_library("browser") {
|
||||
} else {
|
||||
sources += [ "net/net_error_diagnostics_dialog_stub.cc" ]
|
||||
}
|
||||
@@ -10,7 +10,7 @@ index f524f646ce0373c73dd638e4db08decf0cceb69d..885ccd52c3d3815d31eb6874a878d782
|
||||
|
||||
if (is_android) {
|
||||
sources += [
|
||||
@@ -8583,6 +8584,7 @@ static_library("browser_public_dependencies") {
|
||||
@@ -8577,6 +8578,7 @@ static_library("browser_public_dependencies") {
|
||||
"//rlz:rlz_lib",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
index ac82cb9d3b07027e4de424444a34bb03d20b2c28..c02bf90d027d7ba853ccb34d847c3a908b39e6bf 100644
|
||||
index ec85200d643c964acb8fd7bf858e3e7932816d6b..6fc1aa57fc2e700ce12032b77443d423b1495017 100644
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -5159,6 +5159,7 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
|
||||
@@ -4647,6 +4647,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/actor/site_policy.cc b/chrome/browser/actor/site_policy.cc
|
||||
index 019d3f039149541ab4acd9d20edec36024240ba1..eff285323fe9fdc316e41249f19436e550deb6ef 100644
|
||||
index 04cfedff5a8369e6a29f3e1ac7a9429e4f85d872..90e1d5f38feddade140296fd58123de5a7b214e6 100644
|
||||
--- a/chrome/browser/actor/site_policy.cc
|
||||
+++ b/chrome/browser/actor/site_policy.cc
|
||||
@@ -157,6 +157,7 @@ void MayActOnUrlInternal(const GURL& url,
|
||||
@@ -159,6 +159,7 @@ void MayActOnUrlInternal(const GURL& url,
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
|
||||
index 18e17300b432d1131ff71290a64567b5d35e2115..cf0ec352be0d4c1338da69be2b0594a4d3df5261 100644
|
||||
index f4daf7c490cf9372badc0e63bb46abef811d293d..e07dc258c0441fe47510e52b71b087ab6724de91 100644
|
||||
--- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
|
||||
+++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
|
||||
@@ -119,6 +119,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
|
||||
index 705adbe12a28f25a21a69bbeff456fc11218362f..8f53742e5445efec419a904a0787e1dde1867e83 100644
|
||||
index b7c3520adc628e244069c561fed563ffcb4b7f3f..de5d8bd6e14a0cc10f10f44f556159943a25fe24 100644
|
||||
--- a/chrome/browser/app_controller_mac.mm
|
||||
+++ b/chrome/browser/app_controller_mac.mm
|
||||
@@ -755,7 +755,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
|
||||
@@ -767,7 +767,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
|
||||
|
||||
+ (AppController*)sharedController {
|
||||
static AppController* sharedController = [] {
|
||||
@@ -11,7 +11,7 @@ index 705adbe12a28f25a21a69bbeff456fc11218362f..8f53742e5445efec419a904a0787e1dd
|
||||
NSApp.delegate = sharedController;
|
||||
return sharedController;
|
||||
}();
|
||||
@@ -1379,7 +1379,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
|
||||
@@ -1442,7 +1442,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver {
|
||||
}
|
||||
|
||||
auto it = _profileBookmarkMenuBridgeMap.find(profilePath);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
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 6f1b8b32583798122074bf5b6ca9189b94468540..601d684b73a0cb893ac7b8725649a506625fa35f 100644
|
||||
index 0ec4102207985715be691d796b1f3b86d5ef32c2..581bd5e22b94d74db9888384ca993a6869300b8d 100644
|
||||
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
@@ -1625,6 +1625,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
|
||||
index 91ee1fc056fa5ce47b84643c48bc268a094dc7bd..b7b2c0c8613cbe57f5ee799bd259f9d6f1c03e09 100644
|
||||
index bdabbd8c0b3ac3bd947e523ea518918a5912c39b..ef1a76d4adfe2821af0759beb5130f30f19a6360 100644
|
||||
--- a/chrome/browser/chrome_browser_main_mac.mm
|
||||
+++ b/chrome/browser/chrome_browser_main_mac.mm
|
||||
@@ -101,6 +101,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
||||
@@ -102,6 +102,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
||||
// ChromeBrowserMainParts should have loaded the resource bundle by this
|
||||
// point (needed to load the nib).
|
||||
CHECK(ui::ResourceBundle::HasSharedInstance());
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/content_settings/BUILD.gn b/chrome/browser/content_settings/BUILD.gn
|
||||
index 83addc7dcecca2ff54d85a36446db8577cd6e02d..297d33461738077b6d5f4d03929d046f679f56c4 100644
|
||||
index 3387a9bdbf5389fe64ca824dcd6fe89d3a6ac7b5..c1ea4e46367046670974b5d066a4200dafc827a5 100644
|
||||
--- a/chrome/browser/content_settings/BUILD.gn
|
||||
+++ b/chrome/browser/content_settings/BUILD.gn
|
||||
@@ -128,6 +128,7 @@ source_set("impl") {
|
||||
@@ -131,6 +131,7 @@ source_set("impl") {
|
||||
if (enable_pdf) {
|
||||
deps += [ "//chrome/browser/pdf" ]
|
||||
}
|
||||
|
||||
+2
-2
@@ -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 a4860ac2623ff2a4f768ab5531ae27a244c4f939..88f6dfe55fd2560e3eb0cf2fb85aa190cbbf0896 100644
|
||||
index 00823f100a4fc579964d4bd93787916624313821..b997c4bb9e497022594aaf67f59e8eaa82e933d6 100644
|
||||
--- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
|
||||
+++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
|
||||
@@ -196,6 +196,7 @@ void GetGuestViewDefaultContentSettingRules(
|
||||
@@ -198,6 +198,7 @@ void GetGuestViewDefaultContentSettingRules(
|
||||
ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
|
||||
content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK),
|
||||
content_settings::ProviderType::kNone, incognito));
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc b/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc
|
||||
index cd684bcac8e0591c5221b55f88e34157833fbeae..d0c9feca262786bf90a2e3429f046b00ee109ab7 100644
|
||||
index 05f3584f5a0399d6b2bae43d8048337b5bc0ded5..d27c47375322ad056248188ccae70ad12c3e291d 100644
|
||||
--- a/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc
|
||||
+++ b/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc
|
||||
@@ -123,6 +123,7 @@ class MockSidePanelUI : public SidePanelUI {
|
||||
@@ -129,6 +129,7 @@ class MockSidePanelUI : public SidePanelUI {
|
||||
SetNoDelaysForTesting,
|
||||
(bool no_delays_for_testing),
|
||||
(override));
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
|
||||
index e445fd06416d98fef91c540bcea376d39b826f08..d0d6eb556d960a2dcefa70a65d1d05fd8e06e27b 100644
|
||||
index 230a1c857445b4f52a0760ab31814bf348cf11cc..4878594786f49e083f92977077fe2b2aa2aceb02 100644
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -1216,6 +1216,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
@@ -1217,6 +1217,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP;
|
||||
if (HasPromptedForPath() ||
|
||||
confirmation_reason_ != DownloadConfirmationReason::NONE ||
|
||||
@@ -10,7 +10,7 @@ index e445fd06416d98fef91c540bcea376d39b826f08..d0d6eb556d960a2dcefa70a65d1d05fd
|
||||
user_approved_path) {
|
||||
// If the "DownloadRestrictions" enterprise policy explicitly disallows the
|
||||
// download, don't let the user gesture bypass the dangerous verdict.
|
||||
@@ -1256,6 +1257,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
@@ -1257,6 +1258,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 ||
|
||||
(download_->HasUserGesture() && visits == VISITED_REFERRER)))
|
||||
return DownloadFileType::NOT_DANGEROUS;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/download/internal/android/BUILD.gn b/chrome/browser/download/internal/android/BUILD.gn
|
||||
index 3641277c0f8f12f6e58a77c5682e2980c5ed1a87..bc84b036488a82fe583dc79d042bc203c1fcb423 100644
|
||||
index 0d4ab1e15ea8bbda7bbbeab842b09d1df634be08..75e48ae111cc3bdc57df6dfdc377656b34035f1f 100644
|
||||
--- a/chrome/browser/download/internal/android/BUILD.gn
|
||||
+++ b/chrome/browser/download/internal/android/BUILD.gn
|
||||
@@ -211,6 +211,7 @@ android_resources("java_resources") {
|
||||
@@ -210,6 +210,7 @@ android_resources("java_resources") {
|
||||
"java/res/values/ids.xml",
|
||||
"java/res/values/styles.xml",
|
||||
]
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
|
||||
index 5d5af07b158c0bcb4ecd8c394289724bdf0a870b..88ec49c4f6bd37f6db057207160211ebf506d56f 100644
|
||||
index 64e7c1122ba874b8199ecaa80ebbac478006a91c..b9154c348bcfd9b9469dfe992c437eedb7010802 100644
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -1562,6 +1562,7 @@ source_set("extensions") {
|
||||
@@ -1570,6 +1570,7 @@ source_set("extensions") {
|
||||
"api/tabs/app_window_helper.h",
|
||||
]
|
||||
}
|
||||
|
||||
+2
-2
@@ -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 1ba9d4e28ee582afa4d146cada8af8bfb0770361..fee0596a73c8e5b7693fd7145fd2fec60347c840 100644
|
||||
index e29ca8a104ad7c3245ea4c12356669417cd67b8b..2089934d85343dc99176c83146fa5411dbf55196 100644
|
||||
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
|
||||
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
|
||||
@@ -729,6 +729,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension,
|
||||
@@ -711,6 +711,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension,
|
||||
#else
|
||||
info.incognito_access_pending_change = false;
|
||||
#endif
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
|
||||
index c892073f6ab7c24e8f5255e271f93a26c75a4958..d21bd890d2cf350c4a4fd115c0d18b8632db1f6a 100644
|
||||
index 05704d3dd7d9d1b849ffc016f00a13195097be19..b3119e3389b97c4b965e97255065b057bd1c8b68 100644
|
||||
--- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
|
||||
@@ -92,6 +92,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
|
||||
@@ -91,6 +91,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest(
|
||||
const api::webrtc_logging_private::RequestInfo& request,
|
||||
const std::string& security_origin,
|
||||
std::string* error) {
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
|
||||
index ff14b77e36c1881d34cfd03a5ce075fa4873b2a4..fa1b313c8d05ab8fb5ee5b6be65561565ef3bf19 100644
|
||||
index 2dece2aeaff670b880685f43ed908f146cd1dde0..5243acd2a7a9487ddc6656a010a66ba0b8e1739b 100644
|
||||
--- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
|
||||
+++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
|
||||
@@ -144,6 +144,7 @@ ChromeComponentExtensionResourceManager::Data::Data() {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
|
||||
index dcd2e1fc9aa052387f929ce88e41a23d01362538..8ac75d056f008885bcaa0d9fa2938f61fa877f2b 100644
|
||||
index bb0e7b5cba7e0ab8853aabdd61b5ac3a75776cc7..aa3c8f6ed5e9342cf315fda13e2c547d4a607e1d 100644
|
||||
--- a/chrome/browser/extensions/extension_management.cc
|
||||
+++ b/chrome/browser/extensions/extension_management.cc
|
||||
@@ -1147,6 +1147,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
|
||||
@@ -1152,6 +1152,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext(
|
||||
content::BrowserContext* context) const {
|
||||
TRACE_EVENT0("browser,startup",
|
||||
"ExtensionManagementFactory::BuildServiceInstanceFor");
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
|
||||
index 7e5d7a19679af97e27f6c3833fea3ffb965c519d..c463c18ca051e5d9f23a7755ae1586ccc4cc6ea7 100644
|
||||
index 2b5f1e30a5e095e850e6438c2c2115f4b6406efa..1ed1b514525c323bd7edf2173cf546b8de0c856d 100644
|
||||
--- a/chrome/browser/extensions/extension_tab_util.cc
|
||||
+++ b/chrome/browser/extensions/extension_tab_util.cc
|
||||
@@ -1100,6 +1100,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
|
||||
@@ -1101,6 +1101,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
|
||||
}
|
||||
|
||||
if (!url.SchemeIs(content::kChromeUIScheme)) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc
|
||||
index 51f344626c5fd10f3e8487908881f5187288a78f..0e0e5f4fc8ecbf8ae8687415d002f46bac9042aa 100644
|
||||
index 9d7f383e3878f0410ca7e7f34d7941b60847c097..4b9db45c891ea676f0f19c2769bdf26d945b521d 100644
|
||||
--- a/chrome/browser/external_protocol/external_protocol_handler.cc
|
||||
+++ b/chrome/browser/external_protocol/external_protocol_handler.cc
|
||||
@@ -414,7 +414,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/global_features.cc b/chrome/browser/global_features.cc
|
||||
index f5698f7b8c35a4f83be7ff87cb8bdd2eb343285c..65c1410a086b8ddfcfddd4889c9b5e10c5bba341 100644
|
||||
index e1c76d0788c262d1e2f4fe20329d3a3c31c1d646..9b816385699617b3e9d522f10a841abb2da503e8 100644
|
||||
--- a/chrome/browser/global_features.cc
|
||||
+++ b/chrome/browser/global_features.cc
|
||||
@@ -71,6 +71,7 @@
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
|
||||
index ad958053aeb2082222cea33886bb578120842391..c7af5895c07e74f1a3c4836028feb9801e520dbc 100644
|
||||
index 9d53a907e2adff177cb5ee5807f96e74510e4338..7ca33211d4ddc0e2f3cd7bd0af253f09579f3869 100644
|
||||
--- a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
|
||||
+++ b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
|
||||
@@ -21,7 +21,7 @@ found in the LICENSE file.
|
||||
@@ -11,7 +11,7 @@ index ad958053aeb2082222cea33886bb578120842391..c7af5895c07e74f1a3c4836028feb980
|
||||
android:id="@+id/hub_toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -108,6 +108,7 @@ found in the LICENSE file.
|
||||
@@ -109,6 +109,7 @@ found in the LICENSE file.
|
||||
android:tooltipText="@string/accessibility_search_loupe_tooltip_text"
|
||||
style="@style/ToolbarMenuButton"
|
||||
app:tint="@color/default_icon_color_tint_list" />
|
||||
@@ -19,7 +19,7 @@ index ad958053aeb2082222cea33886bb578120842391..c7af5895c07e74f1a3c4836028feb980
|
||||
<include layout="@layout/menu_button" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -150,5 +151,5 @@ found in the LICENSE file.
|
||||
@@ -151,5 +152,5 @@ found in the LICENSE file.
|
||||
android:gravity="top"
|
||||
android:importantForAccessibility="no"
|
||||
android:visibility="gone"/>
|
||||
|
||||
@@ -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 c21884ac3ab0106260a54dbfa355ba2134cd5725..cec381d0852d12a0d71ef58b8324a9078e6d479b 100644
|
||||
index 269ec919d15699715b831ffadcc3525284427803..5c8f6aa405186c2bc2a207d8bc23c24078daaa8b 100644
|
||||
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
@@ -487,6 +487,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
|
||||
@@ -431,6 +431,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
|
||||
void WebRtcLogUploader::UploadCompressedLog(
|
||||
WebRtcLogUploader::UploadDoneData upload_done_data,
|
||||
std::unique_ptr<std::string> post_data) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/metrics/chrome_feature_list_creator.cc b/chrome/browser/metrics/chrome_feature_list_creator.cc
|
||||
index 164aa78ca9e0e398454e56cceab549b5de106bdd..4047976cbf840e87aed853988730984d717ddcae 100644
|
||||
index c8ab55cf0bb3f347fcd826c054eff3b1c1cf5e39..c09bb2979c9831320e0d565675964ca2dce5ad52 100644
|
||||
--- a/chrome/browser/metrics/chrome_feature_list_creator.cc
|
||||
+++ b/chrome/browser/metrics/chrome_feature_list_creator.cc
|
||||
@@ -355,5 +355,6 @@ void ChromeFeatureListCreator::SetupInitialPrefs() {
|
||||
@@ -351,5 +351,6 @@ void ChromeFeatureListCreator::SetupInitialPrefs() {
|
||||
local_state_->SetTime(variations::prefs::kVariationsSeedDate,
|
||||
base::Time::Now());
|
||||
}
|
||||
|
||||
@@ -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 e6f6074737d7d65e7318544b22da0c5bb1e91ce6..e2b0fa6624504df22188707f84a2b482b6a18bce 100644
|
||||
index d0bb264e55f1f962af3f076c2de0eb3911cabfc2..882c149b84b9807711e2df9dbbad4533117aee9b 100644
|
||||
--- a/chrome/browser/net/profile_network_context_service.cc
|
||||
+++ b/chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -718,6 +718,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
|
||||
@@ -704,6 +704,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() {
|
||||
std::vector<std::string> excluded_spkis(
|
||||
TranslateStringArray(ct_excluded_spkis));
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
|
||||
index 50f5e572971bcd3da23183b399abe542fcd76604..bfff02e4fc72b6ed5ba12a3ce3d7798cf0f713ac 100644
|
||||
index 341cae2bda7fce9e5133966cb8670b9858a44654..1b5175a36e7f0084a5d33200bea780b5cf6a3fb0 100644
|
||||
--- a/chrome/browser/net/system_network_context_manager.cc
|
||||
+++ b/chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -478,7 +478,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
|
||||
index 47ee65a6234e2082ebf5a342019a698603e7e8b3..409c00395c0bed3a33966801b2b15af272d8eb44 100644
|
||||
index e7e27da2d113967179a9f9b9f5019bc5e86f81f4..4bfea38dc702c110c4ed139d5022a034d72f78a4 100644
|
||||
--- a/chrome/browser/prefs/BUILD.gn
|
||||
+++ b/chrome/browser/prefs/BUILD.gn
|
||||
@@ -162,6 +162,7 @@ source_set("impl") {
|
||||
@@ -164,6 +164,7 @@ source_set("impl") {
|
||||
"//services/preferences/tracked",
|
||||
"//services/preferences/tracked:features",
|
||||
]
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
||||
index 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a317e8200 100644
|
||||
index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52cf062eb12 100644
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -1662,6 +1662,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||
@@ -1687,6 +1687,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||
false);
|
||||
|
||||
// This is intentionally last.
|
||||
@@ -10,7 +10,7 @@ index 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a
|
||||
RegisterLocalStatePrefsForMigration(registry);
|
||||
}
|
||||
|
||||
@@ -2146,6 +2147,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -2171,6 +2172,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
registry->RegisterBooleanPref(prefs::kStaticStorageQuotaEnabled, false);
|
||||
@@ -18,7 +18,7 @@ index 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a
|
||||
}
|
||||
|
||||
void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -2554,6 +2556,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
|
||||
@@ -2593,6 +2595,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
|
||||
profile_prefs->ClearPref(kObsoletePasswordsUseUPMLocalAndSeparateStores);
|
||||
profile_prefs->ClearPref(kObsoleteEmptyProfileStoreLoginDatabase);
|
||||
profile_prefs->ClearPref(kObsoleteUpmAutoExportCsvNeedsDeletion);
|
||||
@@ -26,7 +26,7 @@ index 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a
|
||||
base::DeleteFile(profile_path.Append(FILE_PATH_LITERAL("Login Data")));
|
||||
base::DeleteFile(
|
||||
profile_path.Append(FILE_PATH_LITERAL("Login Data For Account")));
|
||||
@@ -2561,6 +2564,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
|
||||
@@ -2600,6 +2603,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs,
|
||||
profile_path.Append(FILE_PATH_LITERAL("Login Data-journal")));
|
||||
base::DeleteFile(
|
||||
profile_path.Append(FILE_PATH_LITERAL("Login Data For Account-journal")));
|
||||
|
||||
@@ -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 95428bea917ec1c156b46e449c6fd17c740c03ab..545be90ba58257c9c98e2c7303af9a72653f5e8a 100644
|
||||
index cf4ebf3d26398785e8ef558eb0b010fe4b752601..2f265b95bbcfa6ae7595b6684b418a466838d9ca 100644
|
||||
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
|
||||
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
||||
@@ -193,6 +193,7 @@ const auto kTrackedPrefs = std::to_array<prefs::TrackedPreferenceMetadata>({
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
|
||||
index d252c882b70153f568cbe68f881056c232ffe118..e3990e9a8c3e7df24aae8f6a296d94dc7e36114d 100644
|
||||
index 64b3e5af4de03e477d91af925bf70d78df398410..c38651d8c4105c82b4ebfded90d56bc43a63abad 100644
|
||||
--- a/chrome/browser/profiles/profile.cc
|
||||
+++ b/chrome/browser/profiles/profile.cc
|
||||
@@ -114,6 +114,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
|
||||
index 4e0f17990817293a98c16a24d0006bbd604a5bdb..05c272d55de8e1c77dbdb560c41933a07fbe4c5e 100644
|
||||
index 37210cb33ba7777a4466aac755c734502df88ea2..14215b26d9d0b414c3d907ebd2c4e0e7c7759f3f 100644
|
||||
--- a/chrome/browser/profiles/profile_attributes_entry.cc
|
||||
+++ b/chrome/browser/profiles/profile_attributes_entry.cc
|
||||
@@ -1106,6 +1106,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
|
||||
index 0e1725bf6d5b087bf1af2b192acb7581fa346ee7..b9e5ddaec5dab160762840e8a5278ad74c59b4ca 100644
|
||||
index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c59d3f153 100644
|
||||
--- a/chrome/browser/profiles/profile_avatar_icon_util.cc
|
||||
+++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
|
||||
@@ -459,7 +459,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
|
||||
@@ -27,7 +27,7 @@ index 0e1725bf6d5b087bf1af2b192acb7581fa346ee7..b9e5ddaec5dab160762840e8a5278ad7
|
||||
static const std::array<IconResourceInfo, kDefaultAvatarIconsCount>
|
||||
resource_info = {{
|
||||
// Old avatar icons:
|
||||
@@ -969,6 +971,7 @@ base::Value::List GetIconsAndLabelsForProfileAvatarSelector(
|
||||
@@ -969,6 +971,7 @@ base::ListValue 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/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
||||
index 8981bef78da4f234bb261c66d8e1fe5a149ea94c..b510a8cc38f2c62f6301ef660226d1d1db1ac339 100644
|
||||
index 6bc3db5c106e40aadc0aec040ed029603387a8fb..aa5f018e5043729b5f61f9db25a89f450474b963 100644
|
||||
--- a/chrome/browser/profiles/profile_impl.cc
|
||||
+++ b/chrome/browser/profiles/profile_impl.cc
|
||||
@@ -566,6 +566,7 @@ void ProfileImpl::TakePrefsFromStartupData() {
|
||||
@@ -570,6 +570,7 @@ void ProfileImpl::TakePrefsFromStartupData() {
|
||||
CreateExtensionPrefStore(this, /*incognito_pref_store=*/false));
|
||||
|
||||
ProfileKeyStartupAccessor::GetInstance()->Reset();
|
||||
|
||||
@@ -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 2dabd636233471e1df67c3b0a77da789c914b3bd..6fb3de57c2c358fd7eb40c9490afd2f2e9447d1b 100644
|
||||
index 62cdd2ab941685926c34b90d9858211bdeaaba6f..7f6fb5722c3e9804639f2cc5fc60baf9b79e4cc9 100644
|
||||
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -2483,6 +2483,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
|
||||
@@ -2507,6 +2507,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 5b3684ecf0c1bde67c50dddcf08b180865cb7808..1fe60ef8c3d8e25bcacc870a9043c1d93cc6aa52 100644
|
||||
index 5caabda59bb17fb8558b66538eb02f6aedb224f3..86f07dfa90fa3e5ba650f93033dff71eb6ab2e16 100644
|
||||
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
|
||||
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
|
||||
@@ -199,6 +199,7 @@ class RenderViewContextMenu
|
||||
@@ -200,6 +200,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/certificate_manager/certificate_manager.ts b/chrome/browser/resources/certificate_manager/certificate_manager.ts
|
||||
index 1dac1e54d4561a3c3b685af3fc26938b77a02ecd..b5bce0d48a868834c9a8373236a26c0a87153246 100644
|
||||
index 36f29e1137ebb11e3cf9e6a28e25b8f87a2383ab..8a3533cabaf4b9f5ba33f0dc3f6af6de636e5285 100644
|
||||
--- a/chrome/browser/resources/certificate_manager/certificate_manager.ts
|
||||
+++ b/chrome/browser/resources/certificate_manager/certificate_manager.ts
|
||||
@@ -547,4 +547,4 @@ declare global {
|
||||
@@ -537,4 +537,4 @@ declare global {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
|
||||
index 04b2069bd3bdb50f034b997e2461fe386287e4c4..95e2d2682e246c2b6a107d2b9382f5d1e67cd75e 100644
|
||||
index 01bd4cfbf9588d70d21db6543b100c61b2950971..927fe2b260fb50bc544ef1717351caa255852d6c 100644
|
||||
--- a/chrome/browser/resources/settings/BUILD.gn
|
||||
+++ b/chrome/browser/resources/settings/BUILD.gn
|
||||
@@ -508,4 +508,5 @@ build_webui("build") {
|
||||
@@ -505,4 +505,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 099860c380c2d6678031550aacf7324d7910f49e..fc56006556493d9ff1960207db9214ec55cb3825 100644
|
||||
index f3074049c1f3a37b679f2571b74f827cb796c1bc..e110dae96b16ccfef52f6953dd59581b65e7d389 100644
|
||||
--- a/chrome/browser/resources/settings/people_page/sync_controls.ts
|
||||
+++ b/chrome/browser/resources/settings/people_page/sync_controls.ts
|
||||
@@ -176,7 +176,7 @@ export class SettingsSyncControlsElement 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 4cb0a0a1b0016de745268992bcc20875d778ef78..9234c6645c404911246c60f2d2c7cea983b31f62 100644
|
||||
index d3c540ea1b2403d102414c3aeb7e85b837452405..f02442fba2dde111c154001eedb440f232d2edf0 100644
|
||||
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
|
||||
index a116759bfcca4b25940f6abf17ff559beba91c80..e1bbfb1e96f90acbd1e2182de2c5b3cfff343760 100644
|
||||
index 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd68f7b7cdf 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,5 +1,5 @@
|
||||
diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
|
||||
index f008482e60b034e1147fe29c4cbfc4c74768c507..2a90897c40932af6d1853fe044cb4476616e5907 100644
|
||||
index 692a677c7c4d5070907a4ef9cb5a385f58408dc8..99eeb34c42730b8a38e47d09c2e90e2c76115268 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/settings/settings_shared.css b/chrome/browser/resources/settings/settings_shared.css
|
||||
index 54efa4fa0ed87f632e5a645f500eeb330c5c5d84..2762884b3eac121669e3ee666ff51a9bafef0191 100644
|
||||
index 37ebfb19d55e0e8f37a7b821864e41319def14ea..cfc224f1de6b7ce56e498b5ac90f585e1e604c12 100644
|
||||
--- a/chrome/browser/resources/settings/settings_shared.css
|
||||
+++ b/chrome/browser/resources/settings/settings_shared.css
|
||||
@@ -8,7 +8,8 @@
|
||||
|
||||
@@ -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 0b0c74c6bff2433e25d07e3b11ffd1e2dd013457..8febddefb692e8744a1477b83dbd2f3bd218c158 100644
|
||||
index 3c614567af955aa39343758a94ccf795c1d2195c..1705b280594749f8b9bfe1e21a34196156a5bb5f 100644
|
||||
--- a/chrome/browser/resources/settings/site_settings/constants.ts
|
||||
+++ b/chrome/browser/resources/settings/site_settings/constants.ts
|
||||
@@ -70,6 +70,7 @@ export enum ContentSettingsTypes {
|
||||
@@ -69,6 +69,7 @@ export enum ContentSettingsTypes {
|
||||
PDF_DOCUMENTS = 'pdfDocuments',
|
||||
SITE_DATA = 'site-data',
|
||||
OFFER_WRITING_HELP = 'offer-writing-help',
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_util.ts b/chrome/browser/resources/settings/site_settings/site_settings_util.ts
|
||||
index 3e7a9ac471b9ac13cae27fbe373b3c4f6433be8d..08fd3505dbf55b5d23d433d36b81c9b5505a95e6 100644
|
||||
index a99e7905e5271c003288729f68c42e9e0b362c43..c22cf28897462f6cfd2352b1e2b7c888335bb8a5 100644
|
||||
--- a/chrome/browser/resources/settings/site_settings/site_settings_util.ts
|
||||
+++ b/chrome/browser/resources/settings/site_settings/site_settings_util.ts
|
||||
@@ -114,7 +114,7 @@ export function getLocalizationStringForContentType(
|
||||
@@ -113,7 +113,7 @@ export function getLocalizationStringForContentType(
|
||||
case ContentSettingsTypes.SMART_CARD_READERS:
|
||||
return null;
|
||||
default:
|
||||
|
||||
@@ -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 365d21e0702c86296a608797c7fa52dfab6af67a..36b32637166166dc6db30f73ad133d6a719c702e 100644
|
||||
index b4c2d9e3d436550dc1dd861c927692df3b291730..0a669cef64a5fc0afce150a72baa010bb9a1d355 100644
|
||||
--- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
|
||||
+++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts
|
||||
@@ -194,7 +194,8 @@ export class PowerBookmarksListElement extends PolymerElement implements
|
||||
|
||||
@@ -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 a7d7017bc27e73d14a55755ce01f60f74d17f4ad..7eaaffd073e954fdf15897a32d02ca56fe9d3919 100644
|
||||
index b273323c8702eda5877a23377e85b92a6b117fd6..f6352416b9201383733e5e8617c2e56421fc94ea 100644
|
||||
--- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn
|
||||
+++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
|
||||
@@ -115,7 +115,7 @@ build_webui("build") {
|
||||
@@ -114,7 +114,7 @@ build_webui("build") {
|
||||
target_gen_dir) ]
|
||||
|
||||
webui_context_type = "untrusted"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/resources/tab_search/BUILD.gn b/chrome/browser/resources/tab_search/BUILD.gn
|
||||
index d8bc1b7393fd55b984adbc850909b9f13a2c195f..6aad94f29dd6e0d9d4227093da2644917c8b8965 100644
|
||||
index f9c3c4dc649d0c8bdf1366236fc7e2cc8b2f53fd..881ec562a5520514ef1418a78cd0b42f8d5e08b1 100644
|
||||
--- a/chrome/browser/resources/tab_search/BUILD.gn
|
||||
+++ b/chrome/browser/resources/tab_search/BUILD.gn
|
||||
@@ -130,4 +130,5 @@ build_webui("build") {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
|
||||
index cade5ee32bf8a2eb92c14a461dd7da07395b5bd1..e8036e71c8bd966df9521e00dafe2f3334909762 100644
|
||||
index 2eaacf40c2473f8d0147d79e99c9432c7d7ffdc3..d925c66c28d2aa2a66b383e31ada67f814e7f8f1 100644
|
||||
--- a/chrome/browser/sessions/session_service.cc
|
||||
+++ b/chrome/browser/sessions/session_service.cc
|
||||
@@ -384,6 +384,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) {
|
||||
@@ -385,6 +385,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/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
|
||||
index 8cb4529d2548fc9d8cdaf52530e8d119857077f8..34f6c35983ed8fc6427acf021c7923b33a95c29d 100644
|
||||
index da32d124606ca2d19359c6c7a2ee5c74f12b90c2..21e999630e30f8ca30011f87cdeba00b62e18e53 100644
|
||||
--- a/chrome/browser/shell_integration_linux.cc
|
||||
+++ b/chrome/browser/shell_integration_linux.cc
|
||||
@@ -516,7 +516,7 @@ std::string GetIconName() {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc
|
||||
index 6eb55ae4b0d8e5c8667104808c05418fcf13e3ce..5de3f24c7260ee47c6f944ab01fd1b7e7d60be83 100644
|
||||
index dfb7b597b28b4e7b740dc4d64343e3a3a9302d88..e866ca9d5a262e0ca82f1a8d692ea858f560d379 100644
|
||||
--- a/chrome/browser/signin/chrome_signin_helper.cc
|
||||
+++ b/chrome/browser/signin/chrome_signin_helper.cc
|
||||
@@ -232,6 +232,7 @@ void ProcessMirrorHeader(
|
||||
@@ -248,6 +248,7 @@ void ProcessMirrorHeader(
|
||||
// Do not allow non-Google origins to open incognito windows.
|
||||
// TODO(crbug.com/40064889): Expand this check to all Mirror headers,
|
||||
// regardless of `service_type`.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/signin/signin_promo_util.cc b/chrome/browser/signin/signin_promo_util.cc
|
||||
index 76d991763c9a992cc1b3e2613a04f6425c0b9438..5cbbb39f79076e1426297d6b0c1f19a290058879 100644
|
||||
index 13318216f3429ec12488fbfd07ca93b0b27a73d5..f7fffaf509ae5f1e305923c2482c27fb1fa724c1 100644
|
||||
--- a/chrome/browser/signin/signin_promo_util.cc
|
||||
+++ b/chrome/browser/signin/signin_promo_util.cc
|
||||
@@ -377,6 +377,7 @@ bool ShouldShowPromoBasedOnImpressionOrDismissalCount(Profile& profile,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ssl/https_upgrades_util.cc b/chrome/browser/ssl/https_upgrades_util.cc
|
||||
index 330ce07feb36770d4604155266b375794c836ad0..92e98c0f61aea89279815e80b58fd438bffecca2 100644
|
||||
index ee5c21622922f5033688f91a4bf4844580f36322..71fd6b1072f06c0b3f0cbdfac06db0c18b057d27 100644
|
||||
--- a/chrome/browser/ssl/https_upgrades_util.cc
|
||||
+++ b/chrome/browser/ssl/https_upgrades_util.cc
|
||||
@@ -72,11 +72,11 @@ ComputeInterstitialState(content::WebContents* web_contents, const GURL& url) {
|
||||
@@ -71,11 +71,11 @@ ComputeInterstitialState(content::WebContents* web_contents, const GURL& url) {
|
||||
security_interstitials::https_only_mode::HttpInterstitialState
|
||||
interstitial_state;
|
||||
interstitial_state.enabled_by_pref =
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
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 266a4356fa947a89ac0b82f1cb0b890418e2727a..2541305a07c9a14782b2e0a2bcec6f1dc3eaac8a 100644
|
||||
index db1734d92f89712ca74d388a7778a15ef66f9d19..371ceafd5dfaa78ebab36fc75e16514c0386de53 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
|
||||
@@ -498,6 +498,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial(
|
||||
@@ -477,6 +477,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial(
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc
|
||||
index dcefb4f3d8b379ed82a8750a9fb5a0252612b894..489ba451c808d4e3f5f23ec17db78c3f4d2572f0 100644
|
||||
index c75419f5d4310f05c0bf272f011febbddae808ad..a10984d02e2f36920b3806fbe5952f076e95f8f9 100644
|
||||
--- a/chrome/browser/sync/sync_service_factory.cc
|
||||
+++ b/chrome/browser/sync/sync_service_factory.cc
|
||||
@@ -438,7 +438,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
|
||||
@@ -437,7 +437,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 c733ac3f31c16c0ba52bee5fb52819fe4c936aaa..de8ae8ec731af0aa1bbe1ab3e1093e9d09ab774c 100644
|
||||
index e20727241ec2ff59adc1cbb12c02227aa1e0aa06..da899f7642c60a79ae3b9ded408f3e9b4c5741d3 100644
|
||||
--- a/chrome/browser/themes/theme_service_factory.cc
|
||||
+++ b/chrome/browser/themes/theme_service_factory.cc
|
||||
@@ -97,6 +97,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
|
||||
@@ -98,6 +98,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
|
||||
std::unique_ptr<KeyedService>
|
||||
ThemeServiceFactory::BuildServiceInstanceForBrowserContext(
|
||||
content::BrowserContext* profile) const {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca331507274b 100644
|
||||
index dac5e9152bb28b2e3ed65e5412f9f172a9aaf3ab..833de51a8a4d9bd8fa0dcc5fa34f1931c60bff08 100644
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -775,6 +775,7 @@ static_library("ui") {
|
||||
@@ -772,6 +772,7 @@ static_library("ui") {
|
||||
# gets componentized.
|
||||
"//chrome/browser/ui/extensions:impl",
|
||||
]
|
||||
@@ -10,7 +10,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33
|
||||
|
||||
if (enable_vr && is_win) {
|
||||
deps += [ "//chrome/browser/vr:vr_base" ]
|
||||
@@ -3366,7 +3367,10 @@ static_library("ui") {
|
||||
@@ -3367,7 +3368,10 @@ static_library("ui") {
|
||||
"//chrome/updater/app/server/win:updater_legacy_idl",
|
||||
]
|
||||
} else {
|
||||
@@ -22,7 +22,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5520,6 +5524,7 @@ static_library("ui_public_dependencies") {
|
||||
@@ -5519,6 +5523,7 @@ static_library("ui_public_dependencies") {
|
||||
"//components/enterprise/buildflags",
|
||||
"//components/paint_preview/buildflags",
|
||||
"//components/safe_browsing:buildflags",
|
||||
@@ -30,7 +30,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33
|
||||
"//components/segmentation_platform/public",
|
||||
"//components/sync",
|
||||
"//components/sync_user_events",
|
||||
@@ -5531,6 +5536,7 @@ static_library("ui_public_dependencies") {
|
||||
@@ -5530,6 +5535,7 @@ static_library("ui_public_dependencies") {
|
||||
if (enable_extensions_core) {
|
||||
public_deps += [ "//extensions/browser" ]
|
||||
}
|
||||
@@ -38,7 +38,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33
|
||||
if (!is_android) {
|
||||
public_deps += [
|
||||
"//build:branding_buildflags",
|
||||
@@ -5655,6 +5661,7 @@ source_set("browser_navigator_params_headers") {
|
||||
@@ -5670,6 +5676,7 @@ source_set("browser_navigator_params_headers") {
|
||||
"//url",
|
||||
]
|
||||
deps = []
|
||||
|
||||
@@ -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 0c2d565adb0ab25b237163961215535c748431fd..06f52abf21c808d8a7ca17ef87a431f044aedb3f 100644
|
||||
index faf125bfd6439aa0e4add87c965d5f970d848432..87c3cdd66981596d394fa07c5b36d30e81162844 100644
|
||||
--- a/chrome/browser/ui/actions/chrome_action_id.h
|
||||
+++ b/chrome/browser/ui/actions/chrome_action_id.h
|
||||
@@ -553,6 +553,7 @@
|
||||
@@ -554,6 +554,7 @@
|
||||
/* Side Panel items */ \
|
||||
E(kActionSidePanelShowAboutThisSite) \
|
||||
E(kActionSidePanelShowAssistant) \
|
||||
|
||||
@@ -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 1ad886bf472a66697287a3d66b3fe14fd0d9a15f..daf3c0f3b6d29892db5ae42908cdaf057a468c7f 100644
|
||||
index 6912b8350e11908daa03dfb46b8182116a419b67..1ae9428477ab08ee71a57abb1e0e7fb1f7ed995d 100644
|
||||
--- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn
|
||||
+++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
|
||||
@@ -22,6 +22,7 @@ android_library("java") {
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
|
||||
index 1b9777d2d65f64d64fa392ede02218acfa6dcc68..cefad80327c18c93e00bacd9cc4896fc2134c752 100644
|
||||
index 4ee0f59a9e23733351e19e354924f14534eaabce..8919708878ec23d0bed05a42135dc37fb539f92c 100644
|
||||
--- a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
|
||||
+++ b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml
|
||||
@@ -46,6 +46,7 @@ found in the LICENSE file.
|
||||
@@ -57,6 +57,7 @@ found in the LICENSE file.
|
||||
app:layout_constraintTop_toBottomOf="@id/location_bar_attachments"
|
||||
app:layout_constraintEnd_toStartOf="@id/margin_spacer"/>
|
||||
|
||||
@@ -10,7 +10,7 @@ index 1b9777d2d65f64d64fa392ede02218acfa6dcc68..cefad80327c18c93e00bacd9cc4896fc
|
||||
<!--
|
||||
Fusebox/Omnibox top-stacked elements on Active Omnibox with Empty content
|
||||
-->
|
||||
@@ -80,7 +81,7 @@ found in the LICENSE file.
|
||||
@@ -91,7 +92,7 @@ found in the LICENSE file.
|
||||
android:contentDescription="@string/accessibility_toolbar_btn_delete_url"
|
||||
android:tooltipText="@string/accessibility_toolbar_btn_delete_url"
|
||||
app:layout_constraintTop_toBottomOf="@id/location_bar_attachments"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
|
||||
index 05fd645a802ad73f65457f03488b49ee48d3eddc..67d5a18760848a5e59f89b97fa69f165acc218e7 100644
|
||||
index 3808e0d4ae7927ddc5c5ae104708a3097308b49b..fa2a9f4641a10c49b4a5ba2a8420338be7f15b43 100644
|
||||
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
|
||||
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
|
||||
@@ -141,6 +141,7 @@ android_library("java") {
|
||||
@@ -146,6 +146,7 @@ android_library("core_java") {
|
||||
"java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java",
|
||||
]
|
||||
@@ -10,7 +10,7 @@ index 05fd645a802ad73f65457f03488b49ee48d3eddc..67d5a18760848a5e59f89b97fa69f165
|
||||
|
||||
deps = [
|
||||
":java_resources",
|
||||
@@ -372,6 +373,7 @@ android_resources("java_resources") {
|
||||
@@ -354,6 +355,7 @@ android_resources("java_resources") {
|
||||
"//components/browser_ui/styles/android:java_resources",
|
||||
"//ui/android:ui_java_resources",
|
||||
]
|
||||
|
||||
@@ -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 a97c0048f5a0dd25c497f150b4fcb58167125c4f..595b0b303fb16fec5514f47960f782de9fbf8586 100644
|
||||
index 1cccb68181828003d6b99ae39c531513bb5ae4b5..aa0586dd47d8be0ae5a10b33888c702da5f1046c 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
|
||||
@@ -71,6 +71,7 @@ found in the LICENSE file.
|
||||
@@ -78,6 +78,7 @@ found in the LICENSE file.
|
||||
android:background="@drawable/modern_toolbar_tablet_text_box_background"
|
||||
android:paddingEnd="@dimen/location_bar_end_padding"
|
||||
android:clipToPadding="false" />
|
||||
|
||||
+6
-6
@@ -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 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce66470033ffb1 100644
|
||||
index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3b091b85d 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
|
||||
@@ -591,6 +591,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
@@ -585,6 +585,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
if (mOptionalButtonCoordinator != null) {
|
||||
mOptionalButtonCoordinator.setBackgroundColorFilter(color);
|
||||
}
|
||||
@@ -10,7 +10,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647
|
||||
}
|
||||
|
||||
private void updateModernLocationBarCorners() {
|
||||
@@ -1255,6 +1256,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
@@ -1259,6 +1260,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
* Tab Page.
|
||||
*/
|
||||
private void updateLocationBarLayoutForExpansionAnimation() {
|
||||
@@ -18,7 +18,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647
|
||||
TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
|
||||
if (isInTabSwitcherMode()) return;
|
||||
|
||||
@@ -1657,6 +1659,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
@@ -1661,6 +1663,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
canvas.restore();
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647
|
||||
// Draw the tab stack button and associated text if necessary.
|
||||
if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) {
|
||||
// Draw the tab stack button image.
|
||||
@@ -2021,6 +2024,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
@@ -2025,6 +2028,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
@Override
|
||||
public void onHomeButtonIsEnabledUpdate(boolean homeButtonEnabled) {
|
||||
mIsHomeButtonEnabled = homeButtonEnabled;
|
||||
@@ -34,7 +34,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647
|
||||
updateButtonVisibility();
|
||||
}
|
||||
|
||||
@@ -2427,6 +2431,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
@@ -2431,6 +2435,7 @@ public class ToolbarPhone extends ToolbarLayout
|
||||
} else {
|
||||
populateUrlClearExpansionAnimatorSet(animators);
|
||||
}
|
||||
|
||||
+2
-2
@@ -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 9b597b55399404e13cd2dbca36e084ec578e3c2b..ff808d8bbc5f4e03f9af4d8ea926f0c2dd3544a3 100644
|
||||
index 31e47d759a66b2dda7e9f7885de02bb09ddbf814..21a10d0bc27b55d399751805d29f3fefc6b306f4 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
|
||||
@@ -270,6 +270,7 @@ public class ToolbarTablet extends ToolbarLayout {
|
||||
@@ -286,6 +286,7 @@ public class ToolbarTablet extends ToolbarLayout {
|
||||
mLocationBar.getTabletCoordinator().tintBackground(textBoxColor);
|
||||
mLocationBar.updateVisualsForState();
|
||||
setToolbarHairlineColor(color);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
||||
index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411fa13d3c75 100644
|
||||
index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0ab3189f7 100644
|
||||
--- a/chrome/browser/ui/browser.cc
|
||||
+++ b/chrome/browser/ui/browser.cc
|
||||
@@ -555,7 +555,7 @@ Browser* Browser::Create(const CreateParams& params) {
|
||||
@@ -544,7 +544,7 @@ Browser* Browser::Create(const CreateParams& params) {
|
||||
// should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
|
||||
CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
|
||||
|
||||
@@ -11,7 +11,7 @@ index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411f
|
||||
Browser* const browser_ptr = browser.get();
|
||||
BrowserManagerServiceFactory::GetForProfile(params.profile)
|
||||
->AddBrowser(std::move(browser));
|
||||
@@ -571,7 +571,7 @@ std::unique_ptr<Browser> Browser::DeprecatedCreateOwnedForTesting(
|
||||
@@ -560,7 +560,7 @@ std::unique_ptr<Browser> Browser::DeprecatedCreateOwnedForTesting(
|
||||
// should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
|
||||
CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
|
||||
|
||||
@@ -20,7 +20,7 @@ index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411f
|
||||
BrowserManagerServiceFactory::GetForProfile(params.profile)
|
||||
->AddBrowserForTesting(browser.get());
|
||||
return browser;
|
||||
@@ -584,7 +584,7 @@ Browser::Browser(const CreateParams& params)
|
||||
@@ -573,7 +573,7 @@ Browser::Browser(const CreateParams& params)
|
||||
window_(nullptr),
|
||||
tab_strip_model_delegate_(
|
||||
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
|
||||
@@ -29,7 +29,7 @@ index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411f
|
||||
tab_strip_model_delegate_.get(),
|
||||
params.profile,
|
||||
// Tab groups are disabled for app browsers.
|
||||
@@ -1349,6 +1349,7 @@ void Browser::OnWindowClosing() {
|
||||
@@ -1321,6 +1321,7 @@ void Browser::OnWindowClosing() {
|
||||
if (tab_restore_service && notify_restore_service) {
|
||||
tab_restore_service->BrowserClosing(GetFeatures().live_tab_context());
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user