Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated patches from Chromium 98.0.4736.0 to Chromium 98.0.4750.0.

Browse Source
This commit is contained in:
mkarolin
2022-01-24 15:38:37 -05:00
parent 429ccf35a8
commit b71d56922b
110 changed files with 240 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/base-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 85eccad92c64aef79e8af4ea5c88d23ceb9cd079..cc5842338618830c2b3ba2da4ca9c3980c91020a 100644
index f024bcbfd273b5c1817bab0d9b4e1a295552bdbe..c7741fd198328d20c837ed30b833a00a0fdc37d8 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4089,6 +4089,7 @@ if (is_android) {
@@ -4113,6 +4113,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/TaskTraits.java",
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
]
patches/base-threading-thread_restrictions.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index a9d955d6eddda079c36fded464c14610b6ea3da1..996485fc782d099641628af48310edf8a2d24404 100644
index 5b6ad6a3c78b23bf4bbf9daab0b2574ac0e5b836..20ff203e80bea63af4c720b7f3bc7df51195f60d 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -537,6 +537,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
@@ -533,6 +533,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
ScopedAllowBaseSyncPrimitives& operator=(
const ScopedAllowBaseSyncPrimitives&) = delete;
patches/base-trace_event-builtin_categories.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index b676bc5236018f7e645fd71bd79139756d383e4a..e557ddb298c707bfc5ce68c1f2a0f3b2d2b184c0 100644
index f6f346bbc56d4a1f8693330b010fd4b3c2d28628..c480d54ced7f2763ae9b2a26904cc22a44685bf1 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -175,6 +175,7 @@
@@ -174,6 +174,7 @@
X("WebCore") \
X("webrtc") \
X("xr") \
patches/build-android-gyp-dex.py.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index f64ddceb359b32fee6cb553410e7091b1eb39699..e36b06f760d262158c5957b64fb455d272b52ee6 100755
index c8495191ad86dc803c56be0e1bce27dd6cc5b9d2..b60e4d62b3211a713143046e6fbedfd858183310 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -53,7 +53,7 @@ _IGNORE_WARNINGS = (
patches/build-android-gyp-util-resource_utils.py.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/android/gyp/util/resource_utils.py b/build/android/gyp/util/resource_utils.py
index 5d1318d15605b9d2a9c762c47b9c7121b1c2fc25..333ce0126892d0b2f8c11e062761bd1e0ae4709f 100644
index cc83a5d9c43475d44e7fff9898b7c9427d9a3877..d9c231f5c6ab4d5055c604aa1c696564e2433375 100644
--- a/build/android/gyp/util/resource_utils.py
+++ b/build/android/gyp/util/resource_utils.py
@@ -257,6 +257,7 @@ class ResourceInfoFile(object):
patches/build-config-android-internal_rules.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index d3833fd9b927a63539744a380f3f96285d4ac581..cc8586f033ccc54e66d107ec69725be297c11c4a 100644
index ef59449f86533a9454f7b1f34a46d482d2e784ca..a675302cf2db3b4c1ac816aed5c2bb9124bf9781 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -3922,6 +3922,7 @@ if (enable_java_templates) {
@@ -3926,6 +3926,7 @@ if (enable_java_templates) {
}
_analysis_public_deps += [ ":$_bytecode_checks_target" ]
}
patches/build-config-android-rules.gni.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 91417e94bf830c690e92740b1bc4662d07e7fb2d..716cc95c8fdecaff35ee1c0bfab088dfce129465 100644
index aae10aa8a6d45f47412302e69ac730f050d8d9bc..8ad1d919a66cf4b8f9df476cb22cadcd2f9fdfb1 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -479,6 +479,7 @@ if (enable_java_templates) {
patches/chrome-BUILD.gn.patch
+10 -10
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a718e5226 100644
index 9e2c48f5bc73375d95cb51e1793b6167fe3fd5fb..eba7bcd8ec2719b301e073545f58a5612114dcfc 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -170,6 +170,7 @@ if (!is_android && !is_mac) {
@@ -10,7 +10,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
deps += [
":chrome_dll",
@@ -467,11 +468,12 @@ if (is_win) {
@@ -458,11 +459,12 @@ if (is_win) {
args += [ "--keystone=0" ]
}
}
@@ -24,7 +24,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
extra_substitutions = [
"CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
"CHROMIUM_SHORT_NAME=$chrome_product_short_name",
@@ -489,6 +491,7 @@ if (is_win) {
@@ -481,6 +483,7 @@ if (is_win) {
"//chrome/common:buildflags",
"//chrome/common:version_header",
]
@@ -32,7 +32,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
if (enable_stripping) {
# At link time, preserve the global symbols specified in the .exports
@@ -561,7 +564,7 @@ if (is_win) {
@@ -553,7 +556,7 @@ if (is_win) {
args =
[
"-b",
@@ -41,7 +41,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
"-v",
chrome_version_full,
"-g",
@@ -635,6 +638,7 @@ if (is_win) {
@@ -627,6 +630,7 @@ if (is_win) {
# this dependency directly copies the file into the framework's
# resources directory.
public_deps += [ ":chrome_framework_widevine_signature" ]
@@ -49,7 +49,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
}
}
@@ -667,9 +671,11 @@ if (is_win) {
@@ -659,9 +663,11 @@ if (is_win) {
"--scm=0",
]
}
@@ -61,7 +61,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
if (is_chrome_branded) {
# These entitlements are bound to the official Google Chrome signing
# certificate and will not necessarily work in any other build.
@@ -694,6 +700,7 @@ if (is_win) {
@@ -686,6 +692,7 @@ if (is_win) {
info_plist_target = invoker.info_plist_target
} else {
info_plist_target = ":chrome_helper_plist"
@@ -77,7 +77,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
if (!is_component_build) {
# Specify a sensible install_name for static builds. The library is
@@ -1342,6 +1350,7 @@ if (is_win) {
@@ -1335,6 +1343,7 @@ if (is_win) {
group("browser_dependencies") {
public_deps = [
@@ -85,7 +85,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//chrome/browser",
@@ -1450,12 +1459,13 @@ group("child_dependencies") {
@@ -1446,12 +1455,13 @@ group("child_dependencies") {
# this is OK because all of content is linked into one library.
"//content/browser",
]
@@ -100,7 +100,7 @@ index b137978b640cd18c6a8566b4c53991e9581ecece..49ffe8075707513b7b1340ed337ddc7a
output = "$target_gen_dir/chrome_exe_version.rc"
}
@@ -1509,6 +1519,7 @@ group("resources") {
@@ -1505,6 +1515,7 @@ group("resources") {
"//chrome/browser:resources",
"//chrome/common:resources",
"//chrome/renderer:resources",
patches/chrome-android-BUILD.gn.patch
+8 -8
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 8f3dd66ba879e55e2ef4c505933fd381ae93b0ed..8c7477e42af1713f8434aaab4ec00b4dda99a068 100644
index db03f099432e041422a1844fab45cb9952fc5e0d..70af5c90521a9de3632dee5d64d9311691654027 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -253,6 +253,7 @@ android_resources("chrome_app_java_resources") {
@@ -252,6 +252,7 @@ android_resources("chrome_app_java_resources") {
"//third_party/androidx:androidx_preference_preference_java",
"//third_party/androidx:androidx_recyclerview_recyclerview_java",
]
@@ -10,7 +10,7 @@ index 8f3dd66ba879e55e2ef4c505933fd381ae93b0ed..8c7477e42af1713f8434aaab4ec00b4d
}
if (enable_vr) {
@@ -628,6 +629,7 @@ android_library("chrome_java") {
@@ -625,6 +626,7 @@ android_library("chrome_java") {
]
deps += feed_deps
@@ -18,7 +18,7 @@ index 8f3dd66ba879e55e2ef4c505933fd381ae93b0ed..8c7477e42af1713f8434aaab4ec00b4d
srcjar_deps = [
":autofill_verification_status_generated_enum",
@@ -660,6 +662,7 @@ android_library("chrome_java") {
@@ -657,6 +659,7 @@ android_library("chrome_java") {
"//components/offline_pages/core:offline_page_model_enums_java",
"//net:effective_connection_type_java",
]
@@ -26,7 +26,7 @@ index 8f3dd66ba879e55e2ef4c505933fd381ae93b0ed..8c7477e42af1713f8434aaab4ec00b4d
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -778,6 +781,7 @@ java_group("chrome_all_java") {
@@ -775,6 +778,7 @@ java_group("chrome_all_java") {
"//chrome/android/features/tab_ui:module_desc_java",
]
}
@@ -34,7 +34,7 @@ index 8f3dd66ba879e55e2ef4c505933fd381ae93b0ed..8c7477e42af1713f8434aaab4ec00b4d
}
# This is a list of all base module jni headers. New features should add their
@@ -823,6 +827,7 @@ group("jni_headers") {
@@ -820,6 +824,7 @@ group("jni_headers") {
"//components/ukm/android:jni_headers",
"//components/webauthn/android:jni_headers",
]
@@ -42,7 +42,7 @@ index 8f3dd66ba879e55e2ef4c505933fd381ae93b0ed..8c7477e42af1713f8434aaab4ec00b4d
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -2184,6 +2189,7 @@ if (current_toolchain == default_toolchain) {
@@ -2186,6 +2191,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -50,7 +50,7 @@ index 8f3dd66ba879e55e2ef4c505933fd381ae93b0ed..8c7477e42af1713f8434aaab4ec00b4d
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
if (webview_includes_weblayer && !_is_bundle_module) {
@@ -2584,6 +2590,7 @@ android_library("base_module_java") {
@@ -2586,6 +2592,7 @@ android_library("base_module_java") {
"//components/payments/content/android:service_java",
"//third_party/androidx:androidx_browser_browser_java",
]
patches/chrome-android-chrome_java_sources.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 9a99902c61aaae7134c150660fe682bc24aa9c61..0af29be730b9cb20963026dbb3f48052510778d8 100644
index cfa404a076dcdf469a1eb33df71cc3ad6680ed26..a415140c5069973865b876659c8be0a0a6551e1f 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1248,3 +1248,4 @@ chrome_java_sources = [
@@ -1250,3 +1250,4 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java",
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
]
patches/chrome-android-expectations-lint-suppressions.xml.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
index 93e734cb9843da047f1ba1042972e9a1d5bbd7fa..78867f300b8d0da6a106932aff65bfde4fcb0163 100644
index 93e734cb9843da047f1ba1042972e9a1d5bbd7fa..ad476b9ab67df6da3d8ec28bbabd7d3cfe9bee6c 100644
--- a/chrome/android/expectations/lint-suppressions.xml
+++ b/chrome/android/expectations/lint-suppressions.xml
@@ -300,4 +300,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
patches/chrome-android-java-AndroidManifest.xml.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 64bea5349783a7a0b13540bd40662b4575437ca3..146b7f2349ef1cf494786c922266bdfbc74bdd0e 100644
index ea8dbd84eb1514f77c59c26fc05308e5341424eb..ef96ee54e0e77d12a1ab92236584c2b3f72b8c0b 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -59,7 +59,9 @@ by a child template that "extends" this file.
@@ -65,7 +65,7 @@ index 64bea5349783a7a0b13540bd40662b4575437ca3..146b7f2349ef1cf494786c922266bdfb
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
@@ -1205,6 +1219,7 @@ by a child template that "extends" this file.
@@ -1193,6 +1207,7 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
</activity>
@@ -73,7 +73,7 @@ index 64bea5349783a7a0b13540bd40662b4575437ca3..146b7f2349ef1cf494786c922266bdfb
{% block extra_application_definitions %}
{% endblock %}
{% endmacro %}
@@ -1283,6 +1298,7 @@ by a child template that "extends" this file.
@@ -1271,6 +1286,7 @@ by a child template that "extends" this file.
<!-- ARCore APK integration -->
<!-- This tag indicates that this application optionally uses ARCore. -->
<meta-data android:name="com.google.ar.core" android:value="optional" />
patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+2 -2
View File
@@ -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 1da1584e58946da1e261b006317b61212f488d1a..9337ff3f5fcbeffdd6573fdacb779f7ad0b436f0 100644
index 8493af8e0a83cbf9682bc3ff3ecca99afe65f7f6..1c268d41b401988ec55633bc21f6c0e62518bd3e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -2376,6 +2376,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -2392,6 +2392,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
}
private void hideOverview() {
patches/chrome-app-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index ff9b86f353b224ac333e3929a51e1fd58a05d1ee..aa788283aefceedb5cda0ebc33572f726c2599e4 100644
index 1ec0f190614cbec39b390a4ef72085a362b13944..a1398c6631030de11aef4c4e637f2cc4580ebb19 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -101,6 +101,8 @@ grit("generated_resources") {
patches/chrome-browser-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 6bef73993127f465ac7777c108c884f9e4b685c6..25d695f1404781d1c53c990f70e2ba6b91770362 100644
index 436cf762a1126e8cde09431a8982d033e9e5e9fa..d5e527e205f167b83f9353f6f5a5e66d2a1c7de5 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2565,6 +2565,7 @@ static_library("browser") {
@@ -2574,6 +2574,7 @@ static_library("browser") {
"performance_monitor/metric_evaluator_helper_posix.h",
]
}
patches/chrome-browser-about_flags.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a2212a9e2b6364b8f36b7b74c056d936db62b353..1967b0ce06b0e8ee666705e4364dabf2f640aaf8 100644
index f4dc686f057368840dca509e9adfef87155f5a53..203b61324aa6087dc6db0994a0a0d671e1e257cd 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -7668,6 +7668,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7728,6 +7728,7 @@ const FeatureEntry kFeatureEntries[] = {
// "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
// Histograms" in tools/metrics/histograms/README.md (run the
// AboutFlagsHistogramTest unit test to verify this process).
patches/chrome-browser-browser_process_impl.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 006e0379877f11c18b690264d1671450d4eb92de..db4d9c261fdf391280ff81e4a71d5c96f74975c8 100644
index 9d28c95c4a3deede2fad93d2ae6eeaa2ae5f13c4..ed1b5094ff5439d1a62b035f093490f7b8c035e1 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -226,6 +226,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -225,6 +225,7 @@ class BrowserProcessImpl : public BrowserProcess,
static void RegisterPrefs(PrefRegistrySimple* registry);
private:
patches/chrome-browser-chrome_content_browser_client.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index a4f28371ff18eb79181a89c64bfd0f3ad066450a..ef479f0bb293f3143c8d88256b1347901aa394ed 100644
index f6b785392f08909f4cd6c64b9de8e72fa3cee2d6..b16f93af20de6bfbed6a38e82d0fa4e2850920f8 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -767,6 +767,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -771,6 +771,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
}
private:
patches/chrome-browser-extensions-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index bef646a560403faad0133e6ffbaf498247081c30..c3dcc378b83a8aca21f7456127b0067d880b2274 100644
index eeadf3db84faa17478156a5ce55102504d4757a5..e398df98a392a503c1d87de8384c77b9b7292db6 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1343,6 +1343,7 @@ static_library("extensions") {
patches/chrome-browser-extensions-updater-chrome_update_client_config.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.h b/chrome/browser/extensions/updater/chrome_update_client_config.h
index ce596d1ce617afc791f5f879991210df2687dd64..7d227789768a283a00024e8449315b98085b2969 100644
index 38c717092551008d4bd72456e3060f568761673a..73b0fc851257be17815a54663e837082becc1680 100644
--- a/chrome/browser/extensions/updater/chrome_update_client_config.h
+++ b/chrome/browser/extensions/updater/chrome_update_client_config.h
@@ -78,6 +78,7 @@ class ChromeUpdateClientConfig : public update_client::Configurator {
@@ -77,6 +77,7 @@ class ChromeUpdateClientConfig : public update_client::Configurator {
bool IsPerUserInstall() const override;
std::unique_ptr<update_client::ProtocolHandlerFactory>
GetProtocolHandlerFactory() const override;
patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index a23962831b41d695c8ba097efaa328de02694698..12639406edc0073ae6bccb6297bc38e78edd421b 100644
index ce0970e4bdc1e5fc7d12071735ac9aa90fb273ac..72668ad2d881e942cbe7601b031ac7fa5cd4ed03 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -366,6 +366,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -372,6 +372,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
};
const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
patches/chrome-browser-net-system_network_context_manager.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
index 176da0565ea13852ab48576f96b7bc3b7956e690..e1bf2e66abf366a623ae7636ab92dd3b99871315 100644
index c875f198696822296b0ed5d11280a3f3c5baab32..b7deb28ba4e41c9f434aec5fdba29ee6d43b8cc5 100644
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -228,7 +228,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
@@ -232,7 +232,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem
if (!manager_)
return;
manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
patches/chrome-browser-prefs-browser_prefs.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 23b2491d128f6fdb6c6cbc0cc9839e73a7f29228..e5337a0b45a1e6a6c246f445bf13b86f0e3cd90f 100644
index fbe4d0024c48a646a002a24ace712348fa86cb70..66256bff5748b84e8010b3ea6a1a68288233c1e2 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1090,6 +1090,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
patches/chrome-browser-profiles-profile_impl.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 79e0e8f21f351399e6e07c81139328d9c803b620..33aee50c1cea3b78de6a3c1d8acfbf908c8ab368 100644
index a33a4492c42e8d012bd4b56b9136de5952df0ee2..590930da3edb29b428e8a0faef6bd52a1cc320ca 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -362,7 +362,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
+2 -2
View File
@@ -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 59e3af70b798d18d4f09e8523d4ea4fbf500b156..8f651b33f563c4e90a2a665a927d8408e47ecd45 100644
index 0ddcda1da5602cdb61501b0a68278e8ed8823700..859424413e76c890071bd50a9b06a5c750aa2c35 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1877,6 +1877,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -1872,6 +1872,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
selection_navigation_url_ = match.destination_url;
if (!selection_navigation_url_.is_valid())
return;
patches/chrome-browser-resources-history-history_item.html.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/history/history_item.html b/chrome/browser/resources/history/history_item.html
index 277034276de24627b237915b07101d47df7c3e2a..0e492661cd47c7fe48bff1f57b26ecab3eed3d71 100644
index e870584b227317bab0a84d1cf1ec6b9e8e3acd46..37492dd1ae22f4022459a6bc79bad8c0fb70b6f7 100644
--- a/chrome/browser/resources/history/history_item.html
+++ b/chrome/browser/resources/history/history_item.html
@@ -1,4 +1,4 @@
patches/chrome-browser-resources-settings-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
index ba5d42b59e799a5206fec6477d06232b450338ca..8ce7c724a9af0649f1d2c4e2d540fd389b289212 100644
index 573cbdf8be4229262f9ead32ef770defd48efe33..3526edcdae38b14ef1b5158370bcc72a70ac26cf 100644
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -115,6 +115,7 @@ generate_grd("build_grd") {
@@ -10,7 +10,7 @@ index ba5d42b59e799a5206fec6477d06232b450338ca..8ce7c724a9af0649f1d2c4e2d540fd38
}
preprocess_if_expr("preprocess") {
@@ -823,4 +824,6 @@ ts_library("build_ts") {
@@ -827,4 +828,6 @@ ts_library("build_ts") {
":preprocess",
":preprocess_generated",
]
patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+1 -1
View File
@@ -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 fe7640f89fcebc6d721480e6057bd80bc2940235..b8c9fef45d12a1975ba6925a3e72bdf76014ec20 100644
index a8beaa3b463db2f8e58c513838543a217cfd4369..e219f31ab6cf36f604e4bacf2aa79f221876f965 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -40,6 +40,7 @@
patches/chrome-browser-resources-settings-route.ts.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
index 1c4c5252e82a9d9b595cbfd5423dc1ba1e9235e4..be762f8941d9e29b213cb382fbe76b4ae3fbfef3 100644
index 37933d4aa7746451f328e714efe13e4fc5f640aa..76c21b789a7a2e93a374ba3a53452d9c91f13454 100644
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -8,6 +8,7 @@ import {pageVisibility} from './page_visibility.js';
@@ -10,7 +10,7 @@ index 1c4c5252e82a9d9b595cbfd5423dc1ba1e9235e4..be762f8941d9e29b213cb382fbe76b4a
/**
* Add all of the child routes that originate from the privacy route,
* regardless of whether the privacy section under basic or advanced.
@@ -212,6 +213,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
@@ -211,6 +212,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
// </if>
}
}
patches/chrome-browser-resources-settings-settings.ts.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts
index 83b01a5f862c67ce0991bc76866758326b814570..03a9e15a09adc100c92d0464f99eb4ed198b4594 100644
index f050e4954724b36a027d3c8ec46755261c66824e..f81048f0beda7d8f4d8b878760c9f00537c9c52e 100644
--- a/chrome/browser/resources/settings/settings.ts
+++ b/chrome/browser/resources/settings/settings.ts
@@ -2,6 +2,7 @@
patches/chrome-browser-resources-settings-settings_routes.ts.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts
index 487f9295256a55522273555e95ad3f665c39ebdd..4db4aabd963b09c73f795db96f2a198925f6b64f 100644
index 6e83e6420bf27e0e445855bbffb8ef6d8e64c481..58d2cd411e4c109ea78dd30a2eefd71cd7ec7d67 100644
--- a/chrome/browser/resources/settings/settings_routes.ts
+++ b/chrome/browser/resources/settings/settings_routes.ts
@@ -87,4 +87,5 @@ export type SettingsRoutes = {
@@ -86,4 +86,5 @@ export type SettingsRoutes = {
SYNC_ADVANCED: Route,
SYSTEM: Route,
TRIGGERED_RESET_DIALOG: Route,
patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.ts b/chrome/browser/resources/settings/site_settings/category_default_setting.ts
index b65533c19e68df07b3a6e63e0774fad18eb66b48..fa861b71f2456748c92f42f739f2555dbd120092 100644
index f98c8445e9f3b01f45089d1e2855fa4f3beb9268..e44d51d0a1d19bfcb50afe28912cb4f8fff0f2f2 100644
--- a/chrome/browser/resources/settings/site_settings/category_default_setting.ts
+++ b/chrome/browser/resources/settings/site_settings/category_default_setting.ts
@@ -175,6 +175,7 @@ class CategoryDefaultSettingElement extends CategoryDefaultSettingElementBase {
@@ -10,7 +10,7 @@ index b65533c19e68df07b3a6e63e0774fad18eb66b48..fa861b71f2456748c92f42f739f2555d
case ContentSettingsTypes.BACKGROUND_SYNC:
case ContentSettingsTypes.IMAGES:
case ContentSettingsTypes.JAVASCRIPT:
@@ -209,6 +210,7 @@ class CategoryDefaultSettingElement extends CategoryDefaultSettingElementBase {
@@ -208,6 +209,7 @@ class CategoryDefaultSettingElement extends CategoryDefaultSettingElementBase {
case ContentSettingsTypes.USB_DEVICES:
case ContentSettingsTypes.VR:
case ContentSettingsTypes.WINDOW_PLACEMENT:
patches/chrome-browser-resources-settings-site_settings-constants.ts.patch
+2 -2
View File
@@ -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 9126e545c1d538c2a27e10006628db503617d60e..cd0e35f9252f952fb542a845c7aea7a314769ac6 100644
index 7edb50ccb517eb5329299c32dc1042b9ec8e64fb..b3f4ac035521d8759f37044dfab55569dbbcaf3e 100644
--- a/chrome/browser/resources/settings/site_settings/constants.ts
+++ b/chrome/browser/resources/settings/site_settings/constants.ts
@@ -46,6 +46,7 @@ export enum ContentSettingsTypes {
@@ -45,6 +45,7 @@ export enum ContentSettingsTypes {
// The following item is not in the C++ kContentSettingsTypeGroupNames, but it
// is used everywhere where ContentSettingsTypes is used in JS.
PDF_DOCUMENTS = 'pdfDocuments',
patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
index c3d6ba2c8d6bf538fb38443b7b78d146b3e44b52..2677f95a8b8250e46e5b050bcf0ea024d35a052a 100644
index 9022ce3c12e86a24783651a5294396fded8f8964..01f716c51ba49eed3e122c6b529f55606e9d27cb 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -8,6 +8,7 @@
patches/chrome-browser-resources-signin-profile_picker-profile_picker.ts.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker.ts b/chrome/browser/resources/signin/profile_picker/profile_picker.ts
index e10f3426d9fee1797a17894e60cd9b94933b4ea7..f2eb9beee8d43cb58458bc39cf8e013aaf67b27f 100644
index e31a6eb8bf5137b780c609865c7b48f59e6dbe2c..a441f968dbaa27c642b09e176bac8895a8c2269f 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_picker.ts
+++ b/chrome/browser/resources/signin/profile_picker/profile_picker.ts
@@ -2,6 +2,7 @@
patches/chrome-browser-ui-BUILD.gn.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 229d1b941121c29e04ec636ff39d8d6504769b9e..2e827ee629213edee13401c39f9b674514666e2e 100644
index 4e61a7e44d43ef0d7d5d7f2bd3a871dd83a67755..0efc96f4d54b96f232834742c0e913e4ff616cdc 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -647,6 +647,7 @@ static_library("ui") {
@@ -656,6 +656,7 @@ static_library("ui") {
"//ui/webui/resources/cr_components/most_visited:mojom",
"//v8:v8_version",
]
@@ -10,7 +10,7 @@ index 229d1b941121c29e04ec636ff39d8d6504769b9e..2e827ee629213edee13401c39f9b6745
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [
@@ -3637,10 +3638,13 @@ static_library("ui") {
@@ -3685,10 +3686,13 @@ static_library("ui") {
]
deps += [ "//google_update" ]
} else {
patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
+6 -6
View File
@@ -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 1e7a5d49490b23273e388d5dce2f525877873272..d2e97e3820c35201485ffc0b47d8761c100471ad 100644
index ef28d03fa628b8f3eeb013fa752a17c798e84cf9..4c1b19b91598351d46bd477a6e6e0f0d7e73d626 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
@@ -408,6 +408,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -409,6 +409,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
mCurrentLocationBarColor = color;
// TODO(https://crbug.com/1239289): Change back to #setTint once our min API level is 23.
mLocationBarBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN);
@@ -10,7 +10,7 @@ index 1e7a5d49490b23273e388d5dce2f525877873272..d2e97e3820c35201485ffc0b47d8761c
}
/**
@@ -525,6 +526,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -526,6 +527,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
}
}
@@ -18,7 +18,7 @@ index 1e7a5d49490b23273e388d5dce2f525877873272..d2e97e3820c35201485ffc0b47d8761c
}
@Override
@@ -699,6 +701,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -700,6 +702,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
* @return The right bounds of the location bar after accounting for any visible right buttons.
*/
private int getBoundsAfterAccountingForRightButtons() {
@@ -26,7 +26,7 @@ index 1e7a5d49490b23273e388d5dce2f525877873272..d2e97e3820c35201485ffc0b47d8761c
if (mStartSurfaceScrollFraction == 1.0f) return mToolbarSidePadding;
return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth());
}
@@ -970,6 +973,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -971,6 +974,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
* New Tab Page.
*/
private void updateLocationBarLayoutForExpansionAnimation() {
@@ -34,7 +34,7 @@ index 1e7a5d49490b23273e388d5dce2f525877873272..d2e97e3820c35201485ffc0b47d8761c
TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
FrameLayout.LayoutParams locationBarLayoutParams =
mLocationBar.getPhoneCoordinator().getFrameLayoutParams();
@@ -2117,6 +2121,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -2118,6 +2122,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
} else {
populateUrlClearExpansionAnimatorSet(animators);
}
patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
+3 -3
View File
@@ -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 f20471c5984c66c32331c15032c8e892624f2968..6cd87a9e922f37133434a6e65eebac343e869bcf 100644
index c8024bbb1a3c90777bb7731063bb4d7f3c39212d..124cf0f33089846445d89d9dad110969eed94052 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
@@ -328,10 +328,12 @@ public class ToolbarTablet extends ToolbarLayout
@@ -331,10 +331,12 @@ public class ToolbarTablet extends ToolbarLayout
mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab());
RecordUserAction.record("MobileToolbarDownloadPage");
}
@@ -15,7 +15,7 @@ index f20471c5984c66c32331c15032c8e892624f2968..6cd87a9e922f37133434a6e65eebac34
String description = null;
Context context = getContext();
Resources resources = context.getResources();
@@ -396,6 +398,7 @@ public class ToolbarTablet extends ToolbarLayout
@@ -399,6 +401,7 @@ public class ToolbarTablet extends ToolbarLayout
mLocationBar.getTabletCoordinator().getBackground().setTint(textBoxColor);
mLocationBar.updateVisualsForState();
setToolbarHairlineColor(color);
patches/chrome-browser-ui-browser.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 05435a3fb73fc76929367bea9fad959d70bca631..c678abb210f70685b11489d7d2f6af1f1ad139da 100644
index 970a4c88c92aa578fa67387308557840f89cec5f..6c4d483eeb6f86aaca3a23623e6aa29ae3073ff3 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -441,6 +441,7 @@ Browser* Browser::Create(const CreateParams& params) {
@@ -443,6 +443,7 @@ Browser* Browser::Create(const CreateParams& params) {
// not possible, e.g. using the wrong profile or during shutdown. The caller
// should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628.
CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile));
@@ -10,7 +10,7 @@ index 05435a3fb73fc76929367bea9fad959d70bca631..c678abb210f70685b11489d7d2f6af1f
return new Browser(params);
}
@@ -452,7 +453,7 @@ Browser::Browser(const CreateParams& params)
@@ -454,7 +455,7 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
tab_strip_model_(
patches/chrome-browser-ui-browser.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 475ad86ea147afd5c5d0b592bd0beef8efd994fd..719b4950f62c30ca1242ec10c68fbb02f17f5790 100644
index 10e4e2021cb39f2384f81d7ed8783e85286fa37b..cf7ac291b4305411f6a9545894aa5d6e3b0fac14 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -719,6 +719,7 @@ class Browser : public TabStripModelObserver,
@@ -720,6 +720,7 @@ class Browser : public TabStripModelObserver,
StatusBubble* GetStatusBubbleForTesting();
patches/chrome-browser-ui-browser_navigator.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index a9a2c78eb5b32dd95afc4acd3b50e9e85fd92c9f..dbff959af514922e0e772dcbff81082dbbe9e7aa 100644
index 7086ea81b85049ed38d6f820b4aeb40ff186c826..d7f590bfa03a2c38bc995fa04ba0926f260e82cb 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -486,6 +486,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -10,7 +10,7 @@ index a9a2c78eb5b32dd95afc4acd3b50e9e85fd92c9f..dbff959af514922e0e772dcbff81082d
// Open System Apps in their standalone window if necessary.
// TODO(crbug.com/1096345): Remove this code after we integrate with intent
@@ -758,6 +759,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -760,6 +761,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
bool IsHostAllowedInIncognito(const GURL& url) {
std::string scheme = url.scheme();
base::StringPiece host = url.host_piece();
patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm
index 9f5703897dd3f08b175cd9bc3858567b63864365..632a8d6b1dad7372d46ebc25b81bb1b79b72c7d1 100644
index 2ba95aa4fb7df439446979e65d621a33292cd53a..2311e1e1a1f8179b8a5310cea0f8a2cd6ca86fe4 100644
--- a/chrome/browser/ui/cocoa/main_menu_builder.mm
+++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
@@ -107,6 +107,7 @@ base::scoped_nsobject<NSMenuItem> BuildFileMenu(
@@ -10,7 +10,7 @@ index 9f5703897dd3f08b175cd9bc3858567b63864365..632a8d6b1dad7372d46ebc25b81bb1b7
Item(IDS_REOPEN_CLOSED_TABS_MAC)
.command_id(IDC_RESTORE_TAB)
.remove_if(is_pwa),
@@ -470,6 +471,7 @@ base::scoped_nsobject<NSMenuItem> BuildHelpMenu(
@@ -478,6 +479,7 @@ base::scoped_nsobject<NSMenuItem> BuildHelpMenu(
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK),
#endif
patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 7e04bf6d5c6c936596a68da80c9a74bb686e34d3..1101dcce2df06b18fcccb40b0263ad89a880df2e 100644
index 69c7c8ec1cf315efbae29506b768be01e9295efc..f5344c006b5086f42d963df7e3b683a658c07328 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -374,6 +374,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
@@ -350,6 +350,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
#if !BUILDFLAG(IS_CHROMEOS_ASH)
welcome_enabled =
welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc
index c9222ab4cb9cba20d7e577b04b1f7e418df7e659..a2dc7ea400c615292a00c64398e3ad53696c6e9a 100644
index 51922e667e5c794dd96e8679da896b0e700c4d07..7c36f3c4bdc7e8f74b52be5b45c3d5856fcf5bae 100644
--- a/chrome/browser/ui/startup/startup_tab_provider.cc
+++ b/chrome/browser/ui/startup/startup_tab_provider.cc
@@ -269,6 +269,7 @@ StartupTabs StartupTabProviderImpl::GetNewFeaturesTabs(
patches/chrome-browser-ui-tab_helpers.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index 86c5044667ac15204ed07c009cbc537d087dca1b..21546139186e0793eff9b814a2c5b8afdd8ab5b6 100644
index b4349eadcaf119a60c164a58374cf8f8a80abf79..893086fa5540646fa91655c964af2a95eb525af8 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -552,4 +552,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -561,4 +561,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
// This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and
// organized.
patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index bc15705553b5bbc8e49a4231deb2fcb3df27ce3b..95ab0b6231e78302d5cafc873dac9146d3447b53 100644
index 781080335b38cfe4d54a64264491ab9f3f3b4136..743faae87b110edb3ddeb4774c16817d9be4ce3c 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -937,6 +937,7 @@ void BookmarkBarView::Layout() {
patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 402299ae698ad872ce8d7f127dc20144d036d6f2..c4d034b00a96df3386960b6a832b9d44ae1dfd9c 100644
index 7f6d34a69677f294bda42610a985e04413a2f557..3b212eb1508696e93eeba640a0773880aa85737f 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -661,6 +661,7 @@ void LocationBarView::Layout() {
patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
index 9bd03c838d5c1dafae5a7c2ae91d5fda0651beb4..9dd997e8b67fc3ecdafa4734133100a31cb5d600 100644
index 2bbe0cda09caa0a361ab9b9495a4575b89cc378a..9db2161caced58f8da8a19fa25e6339fb2f2fcfc 100644
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -464,6 +464,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const {
patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
index 08aee7409d3eb03fea11d5f0ce52f48407399153..3ccdf3c5eb8e752ca788995efbba9b8a130ad5dd 100644
index 719678695baff5f7252fb0dd0810855a869fcd4c..81727eb67e0af727d5ac9d342476486b0eff1482 100644
--- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
+++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
@@ -210,6 +210,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h
index 542ec3eba655b383fcf14999bab6cab93504bed9..70340d5b61184123785c86143572a7e0f5180fc8 100644
index 2d2924ed918504a6c5038fe71dac658bedeaa4e2..660bc2a5b2e6d2daba80f0d70eff586cd1c31689 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view.h
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.h
@@ -45,6 +45,7 @@ class ProfileMenuView : public ProfileMenuViewBase {
@@ -46,6 +46,7 @@ class ProfileMenuView : public ProfileMenuViewBase {
gfx::ImageSkia GetSyncIcon() const override;
private:
patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index 41f85bf19810c703c6b00f44783e9568f54e5aa6..9d162ac6e493b220d6c1763138851dbe7db23222 100644
index 8b929587548ec4d04dea755a6ec70511cc19e594..491ddb75bb617b7292879c18030078ab8d4751b0 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -98,12 +98,14 @@ class ToolbarView : public views::AccessiblePaneView,
patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index ef1038c1538c802a93d0fbc7e95a25d113d02d6d..b93d2924d69082a1571575e7271b5201a9671b05 100644
index fb7b4c0590eab0f2a84ed0892e1d5a9cc6285f6b..57c48787e87dcbcbcadb34fbaab315871c72cb1a 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -1259,6 +1259,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
@@ -1262,6 +1262,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
// static
ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
patches/chrome-browser-ui-webui-settings-people_handler.cc.patch
+4 -4
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index fdcd8fe8bc0e2b45ee3e7acf635afc93fb337b8a..4ea95efa37de16b5f846e88fa49b569d15fb71b8 100644
index 8be21e661bef79a6db06db7ca33283f895356262..2616fcb052f27b4872c2e2fdeb2c3e00ac5bde2d 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -819,6 +819,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
@@ -828,6 +828,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
void PeopleHandler::BeforeUnloadDialogCancelled() {
// The before unload dialog is only shown during the first sync setup.
@@ -10,7 +10,7 @@ index fdcd8fe8bc0e2b45ee3e7acf635afc93fb337b8a..4ea95efa37de16b5f846e88fa49b569d
DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount(
signin::ConsentLevel::kSync));
syncer::SyncService* service = GetSyncService();
@@ -869,6 +870,7 @@ std::unique_ptr<base::DictionaryValue> PeopleHandler::GetSyncStatusDictionary()
@@ -878,6 +879,7 @@ std::unique_ptr<base::DictionaryValue> PeopleHandler::GetSyncStatusDictionary()
service && !disallowed_by_policy && service->IsSetupInProgress() &&
!service->GetUserSettings()->IsFirstSetupComplete() &&
identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync));
@@ -18,7 +18,7 @@ index fdcd8fe8bc0e2b45ee3e7acf635afc93fb337b8a..4ea95efa37de16b5f846e88fa49b569d
const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_);
// TODO(crbug.com/1027467): Consider unifying some of the fields below to
@@ -1021,6 +1023,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
@@ -1030,6 +1032,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
}
bool PeopleHandler::IsProfileAuthNeededOrHasErrors() {
patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index ff6b50b68a4e8290dbe43c496578a79207768272..2c9501db3100bd1423a5e428c24cc775f67c8095 100644
index 630eb3901f35c154a7d0136cbe6f865c66fdff07..c132620f5e7c079a52e5b9b9f5b20cea93da0f7a 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -2933,6 +2933,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -2913,6 +2913,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);
patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
index 2e67f6366974cd2f83b088478fd92febfd6e6eda..eefeaacf70031cba1734d4c197aaab8e7c3c0a1c 100644
index c908280ee171eb4a6787a184d0bcdfa90f7ee289..ff0259887f5f65379e2ddf4acbfa0ce3e2c8a6dd 100644
--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -167,6 +167,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
@@ -166,6 +166,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
{ContentSettingsType::FEDERATED_IDENTITY_ACTIVE_SESSION, nullptr},
{ContentSettingsType::AUTO_DARK_WEB_CONTENT, nullptr},
{ContentSettingsType::REQUEST_DESKTOP_SITE, nullptr},
@@ -10,7 +10,7 @@ index 2e67f6366974cd2f83b088478fd92febfd6e6eda..eefeaacf70031cba1734d4c197aaab8e
};
static_assert(base::size(kContentSettingsTypeGroupNames) ==
@@ -391,6 +392,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
@@ -390,6 +391,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
}
ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) {
patches/chrome-browser-web_applications-web_app_shortcut_mac.mm.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/web_applications/web_app_shortcut_mac.mm b/chrome/browser/web_applications/web_app_shortcut_mac.mm
index fde03fb70c3b609f77dcc342c2491e4253fcf91d..ecdfb8da4e73982cdfc87ab82330214ce41d8e85 100644
index c8339aec942435642489207950f78f9001b1ae67..352eadf33e44b410bad8515957626f2978255e10 100644
--- a/chrome/browser/web_applications/web_app_shortcut_mac.mm
+++ b/chrome/browser/web_applications/web_app_shortcut_mac.mm
@@ -764,6 +764,7 @@ base::FilePath GetChromeAppsFolder() {
@@ -769,6 +769,7 @@ base::FilePath GetChromeAppsFolder() {
if (path.empty())
return path;
patches/chrome-common-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index f4276ba39969e089206082afaeff85026a1bf6b8..fc7b16a75fd70888268fe33b75205b9db002e80a 100644
index 57ee233d2e81b710b76daf87f64e18a9a802048a..105c90be4bef348b230b8bbcf2dccf23b66ec8b3 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -86,6 +86,7 @@ source_set("channel_info") {
patches/chrome-installer-linux-common-installer.include.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index ee2277403d123b158843c0fc411d6981db7adaa4..aa710c52727e39211a272bea2736ca85d9c88435 100644
index 3009df446a039c97f18ae566b6fd0dd87847f169..0c4796f9827436feb0d3fc68278d51158f681450 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -75,6 +75,7 @@ process_template() (
@@ -10,7 +10,7 @@ index ee2277403d123b158843c0fc411d6981db7adaa4..aa710c52727e39211a272bea2736ca85
-e "s#@@SNAPNAME@@#${SNAPNAME}#g" \
-e "s#@@PROGNAME@@#${PROGNAME}#g" \
-e "s#@@CHANNEL@@#${CHANNEL}#g" \
@@ -163,6 +164,8 @@ stage_install_common() {
@@ -160,6 +161,8 @@ stage_install_common() {
install -m 644 "${OUTPUTDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
fi
@@ -19,7 +19,7 @@ index ee2277403d123b158843c0fc411d6981db7adaa4..aa710c52727e39211a272bea2736ca85
# ICU data file; Necessary when the GN icu_use_data_file flag is true.
install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
@@ -318,11 +321,13 @@ stage_install_common() {
@@ -298,11 +301,13 @@ stage_install_common() {
# app icons
local icon_regex=".*product_logo_[0-9]\+\."
patches/chrome-installer-mac-signing-config.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/installer/mac/signing/config.py b/chrome/installer/mac/signing/config.py
index 3382f0150ad50054abc614bb45be4b840beba236..ee97d23c7e0c7c1c2108edc3e36aa8a3b016c30e 100644
index 1f33eeac77536227fc175243737084b383c60fb9..87666621e720bcaf3427b00d7ea208897504b2c4 100644
--- a/chrome/installer/mac/signing/config.py
+++ b/chrome/installer/mac/signing/config.py
@@ -203,4 +203,4 @@ class CodeSignConfig(object):
@@ -212,4 +212,4 @@ class CodeSignConfig(object):
@property
def packaging_dir(self):
"""Returns the path to the packaging and installer tools."""
patches/chrome-renderer-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index db4a270efa6e91339b102a8b82a548d2a8d5e371..c8b0d4e6f648ab924fb776defff276e9a90af212 100644
index ddcd14767f877a5eebfe25fcd1316544fb68cc09..eb9e4d588925c2bf626eba762633d93f372d3b51 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -238,6 +238,7 @@ static_library("renderer") {
patches/chrome-test-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 81c72c714785801548b4e15266768a96cfc69e18..ca4da00610e39e5b7c7dcd3b0235d505d41a7df7 100644
index f97ad88dc257b01ce6a51080e390d8ff14a9f88d..c2b05f5fa0cde6461d089257d68efb33c0d85146 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -308,6 +308,7 @@ static_library("test_support") {
patches/chrome-utility-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index 17d7662a205f37b4da7ac9150ba395f6e587aaa1..e57b55d3ddf48d1e662a5b24f7dd858d8067733b 100644
index 1aeb62b8cc97a6e1d5314dad4cc08f2d023be6e6..74c3c62b16745eef465a9cd408599b67fd6e66a1 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -65,6 +65,8 @@ static_library("utility") {
patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
index f277e52fcc7db8dc557f7d3d3861cc63506ecf9a..9185e0b51f290078e0facac1e5ca8555a5e19f9a 100644
index f7f97e74115683caa1ca2e97da553361e9aaf121..34a147665833e4e27944270383101b4b0816e50d 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
@@ -446,7 +446,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@@ -412,7 +412,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
if (queryHasChanged) getInfoForOrigins();
return true;
}
patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
index 801c2454e29842cd40f0e7e68faacbea3f0b7f74..e9e62b66831637df67a463c0be8dc4669343dc73 100644
index 0384465febc06f7d9beb74fc8672c27bd5e4ac7b..7e1eebb65006da113844b4d5e60502bdd59273ec 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
@@ -42,7 +42,7 @@ public class SiteSettingsCategory {
patches/components-component_updater-component_updater_service.h.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h
index 622a95f1206e0f9bcd2dc925c2f3350717e767f1..3931777b6e5a5591f30eaa4b9def56bd677165d1 100644
index 3b565f1df517d01c3397521052b20a6c714cf463..d087b85c405a5412d31aac63296540c4ddf3d3f9 100644
--- a/components/component_updater/component_updater_service.h
+++ b/components/component_updater/component_updater_service.h
@@ -145,6 +145,7 @@ class ComponentUpdateService {
@@ -176,6 +176,7 @@ class ComponentUpdateService {
friend class speech::SodaInstallerImpl;
friend class ::ComponentsHandler;
@@ -10,7 +10,7 @@ index 622a95f1206e0f9bcd2dc925c2f3350717e767f1..3931777b6e5a5591f30eaa4b9def56bd
FRIEND_TEST_ALL_PREFIXES(ComponentInstallerTest, RegisterComponent);
};
@@ -158,6 +159,7 @@ class OnDemandUpdater {
@@ -189,6 +190,7 @@ class OnDemandUpdater {
enum class Priority { BACKGROUND = 0, FOREGROUND = 1 };
virtual ~OnDemandUpdater() = default;
patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc
index c0d468902641c7beddadb4a0b60cc844360e9bdb..f885f8ae90988c07abe37ca49f9a33fe03bdb033 100644
index 8169e361cd7044b13b490153c901b989d2f263e9..7777317ba4e2bd8266726e450d32ee036b906ba3 100644
--- a/components/content_settings/core/browser/content_settings_default_provider.cc
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -421,6 +421,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() {
@@ -425,6 +425,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() {
}
prefs_->ClearPref(kDeprecatedEnableDRM);
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_WIN)
patches/components-content_settings-core-browser-content_settings_registry.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index dc72b8d7248e2916e25ebacab46e9ccc08f71b27..8605e85ead419b533c253065334414d30f657ca3 100644
index b8968af15b69eeb9c7a0427a2c5b31d971624de1..8acc8ba7888cd8f7ef36e535a6d929c5e851d472 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -648,6 +648,7 @@ void ContentSettingsRegistry::Init() {
@@ -641,6 +641,7 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::INHERIT_IN_INCOGNITO,
ContentSettingsInfo::PERSISTENT,
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
patches/components-content_settings-core-common-content_settings.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index 7006397be6f0d348dfe670baf730896eb85a1540..894fd2353a785e2bf1884a4d21ff15b563a06857 100644
index 9a9015cdf6bca4ded57d65b17f423ef0350e3af3..c9065e14f2e7139c5b36260926a59f731e4c5f32 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -103,6 +103,7 @@ constexpr HistogramValue kHistogramValue[] = {
patches/components-content_settings-core-common-content_settings_types.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
index 03716cb3d9006f446670ead7b2cefda345848867..3cbbc70ac524a2e5a1ce9fc87ed6f3f2fb194af6 100644
index c73c004085240ed2106fe93c85692dd28b7639e7..9c932e5127924ff177b079e7ce6e707597aec202 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -292,6 +292,7 @@ enum class ContentSettingsType : int32_t {
@@ -281,6 +281,7 @@ enum class ContentSettingsType : int32_t {
// site instead of the mobile one.
REQUEST_DESKTOP_SITE,
patches/components-download-internal-common-download_item_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc
index 35afa0b40cce4f3b5f0a351778d0f880cc181833..4c4619a85af8146f1bdec925e4e764937451ec1c 100644
index 752070858eda4fb952c46152ae55b695d91b5ee3..f1befe62fa103f8730725b0a98c610ca828264bb 100644
--- a/components/download/internal/common/download_item_impl.cc
+++ b/components/download/internal/common/download_item_impl.cc
@@ -2041,8 +2041,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
@@ -2049,8 +2049,8 @@ void DownloadItemImpl::OnDownloadCompleting() {
base::Unretained(download_file_.get()),
GetTargetFilePath(),
delegate_->GetApplicationClientIdForFileScanning(),
patches/components-infobars-core-infobar_delegate.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h
index 663060f320e43e14ce31f97f80baa4759ba7e539..e67e0635fcac641f5ebb2088cfe16eb34b6f8736 100644
index 5d89e3019138486eaa0c447bb25795b27c121aad..a0949e785beca47d62ac6fe268c9d1a1bcf78ff5 100644
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -176,6 +176,7 @@ class InfoBarDelegate {
patches/components-omnibox-browser-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 03b251049e8781b1bbf3c7a165acb3c4a309211c..e2309329644991585ccef913020347eaa9ea14af 100644
index 28518a0b77948d9b5d8024853f802caa6ee050c6..9e2ff68e47ecca64519c84ef242bb22431aa1daf 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -284,6 +284,7 @@ static_library("browser") {
@@ -280,6 +280,7 @@ static_library("browser") {
"//ui/base",
"//ui/gfx",
]
patches/components-omnibox-browser-autocomplete_controller.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index 9175e19cdccee0dcd9ba29fccdaf6945607b830e..e3fe737c7587bd6f0e02da4610cd1a8e638f5533 100644
index ebd7e9cc910e7a53ceda92837b3e6316aa3c2a83..34823519fb1ac36eae63b73aa1a44548501d983b 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -289,6 +289,7 @@ AutocompleteController::AutocompleteController(
@@ -283,6 +283,7 @@ AutocompleteController::AutocompleteController(
if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
search_provider_ = new SearchProvider(provider_client_.get(), this);
providers_.push_back(search_provider_.get());
patches/components-page_info-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn
index 5d69b2e6cbac8b2fd7aca9314bb72fd4dec42074..0bdc230bed47fd9e1d05f043bf85f8a202b4507f 100644
index c29bced9e24a432caa3e147a262c3cded7db3f9e..3ec21248f92c4f8d42ccaaad253598dc5c678844 100644
--- a/components/page_info/BUILD.gn
+++ b/components/page_info/BUILD.gn
@@ -70,6 +70,7 @@ static_library("page_info") {
@@ -44,6 +44,7 @@ static_library("page_info") {
"//services/device/public/cpp:device_features",
"//services/metrics/public/cpp:ukm_builders",
]
patches/components-page_info-page_info.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
index 05c497ce033c4fb74994884e978da4bae35ff370..c8cb66b85add9c26fbbdac9c278f609f412290bd 100644
index 05e21918c0a7b7e071cd6778d678519ea45d18ec..d0b7683c662f9aabf4b37d2ab02ab8ea8d313b2c 100644
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -964,6 +964,7 @@ void PageInfo::PresentSitePermissions() {
@@ -963,6 +963,7 @@ void PageInfo::PresentSitePermissions() {
}
}
patches/components-permissions-android-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn
index 8ac239febaa96ad8ef3ae3227c0a0159c253f450..fb9839266b63f0e1f9f2b28c3d398e191f385a15 100644
index 958cacdd47e63f09692ad610ab2711fddeafd4d5..82e6083d952f176aa49b0892d050478bbd2ff966 100644
--- a/components/permissions/android/BUILD.gn
+++ b/components/permissions/android/BUILD.gn
@@ -126,6 +126,7 @@ android_library("java") {
patches/components-permissions-permission_uma_util.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc
index dc789bba5081c5ab7ee1af0ce05013906bc3244b..683f12b9215b7b08ac9a6d863b1ccc6f2616e3c3 100644
index ab4860693ea7e82eaca61b81db711b8cf94d238c..eb7c6908aa14dbaffdb0ffc8900297b0e4ef2d63 100644
--- a/components/permissions/permission_uma_util.cc
+++ b/components/permissions/permission_uma_util.cc
@@ -112,6 +112,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) {
@@ -110,6 +110,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) {
case RequestType::kWindowPlacement:
return RequestTypeForUma::PERMISSION_WINDOW_PLACEMENT;
#endif
patches/components-permissions-request_type.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc
index 488d261ff643032548f7401ae5871cb2a506b204..1962f8dadf764d1ef0fe946c83fe492015d41c3e 100644
index cbefa8fb1c52405fbd8f08716c3ae63e5bdd5bbb..6a4755486207bbf241e7ecb44ecddf41ef9d2ac1 100644
--- a/components/permissions/request_type.cc
+++ b/components/permissions/request_type.cc
@@ -335,6 +335,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) {
@@ -329,6 +329,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) {
case permissions::RequestType::kWindowPlacement:
return "window_placement";
#endif
patches/components-sync-driver-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn
index 5397307dac013ac06f539d209c8f0b46721832c9..dc545ddd954822b6f705db328c4c51d173495012 100644
index d78908a1278e20e98af6a70cc0152ae6cf22292f..4a158ec0bb7ce2e7dbd24ecda93ec5a4b6c2e133 100644
--- a/components/sync/driver/BUILD.gn
+++ b/components/sync/driver/BUILD.gn
@@ -112,6 +112,7 @@ static_library("driver") {
patches/components-sync-driver-sync_service_impl.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h
index ae9a3547f076a2b91a1b0b54d4e7256ca107ed3f..6c1cc3e3fa87a33dea001191c2bc1a64517df71b 100644
index 15f4cca7f488b285b99be2a13639921180cce411..69ca3283484854fe2cccdf9f1b19a2af1115e0ac 100644
--- a/components/sync/driver/sync_service_impl.h
+++ b/components/sync/driver/sync_service_impl.h
@@ -260,6 +260,7 @@ class SyncServiceImpl : public SyncService,
patches/content-browser-browser_main_loop.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 5f19adb1136721a6178c5bc08ef2680144cc9f91..cb41ffabc6e71c939c8ac5ddd2102b558e59441b 100644
index e660d54a35e98ed7ced9e2def5e956399ae7bad7..8443db7104e74ddec4c977b1e5b19aabf2f6a8bb 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -153,6 +153,7 @@ class CONTENT_EXPORT BrowserMainLoop {
@@ -154,6 +154,7 @@ class CONTENT_EXPORT BrowserMainLoop {
void RunMainMessageLoop();
// Performs the pre-shutdown steps.
patches/content-browser-renderer_host-navigation_controller_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index aa808f1e503e102541ce2335e84b1bb5afc00dcb..8d9c9525e909acd216aabb6c0a78ea0d8e2ac26f 100644
index a312771fda643092764df77c39ffb8d06cde2653..e5a65acb4f18a1eec4459498ef43bf6f027a4902 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3115,16 +3115,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
@@ -3139,16 +3139,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
// Note: we intentionally leave the pending entry in place for renderer debug
// URLs, unlike the cases below where we clear it if the navigation doesn't
// proceed.
patches/content-browser-renderer_host-navigation_request.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 60e901cf12ab732107d4832712af86d57e244bcd..6fa169958666d2aac304d13fda9c5be1b488623e 100644
index bc43688372d53b873b530d54f9e62fd4c9cd12e0..26563fcbf578de14a7a49368923a91da98864ffa 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2478,6 +2478,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -2482,6 +2482,7 @@ void NavigationRequest::OnRequestRedirected(
common_params_->url = redirect_info.new_url;
common_params_->method = redirect_info.new_method;
common_params_->referrer->url = GURL(redirect_info.new_referrer);
@@ -10,7 +10,7 @@ index 60e901cf12ab732107d4832712af86d57e244bcd..6fa169958666d2aac304d13fda9c5be1
common_params_->referrer = Referrer::SanitizeForRequest(
common_params_->url, *common_params_->referrer);
@@ -3734,6 +3735,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -3751,6 +3752,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();
patches/content-public-browser-browser_main_parts.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/public/browser/browser_main_parts.h b/content/public/browser/browser_main_parts.h
index 497eb07896b25b17d8d66772047ef0f6057f4e21..3cc4c211215b9821f83d792611429ed93854e2c4 100644
index da32e76580497b04acc8faaf2b1a77ad44c3d2ea..e50bd3b82117fd25583e120eec4d9234ce44dacc 100644
--- a/content/public/browser/browser_main_parts.h
+++ b/content/public/browser/browser_main_parts.h
@@ -140,6 +140,9 @@ class CONTENT_EXPORT BrowserMainParts {
@@ -156,6 +156,9 @@ class CONTENT_EXPORT BrowserMainParts {
virtual void OnFirstIdle() {}
virtual void PostMainMessageLoopRun() {}
virtual void PostDestroyThreads() {}
patches/content-public-browser-content_browser_client.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 18327d5fc34a81949924ae3b3a838f4419e683b2..df1d70a0b1a18a685921bd17d0146cda7e11829d 100644
index b0d111897ec1db59ee86588773ea2919fe6a9907..0dc722d60f450fd75084a31d79f1b0f5c5230904 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -1915,6 +1915,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1922,6 +1922,7 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual ui::AXMode GetAXModeForBrowserContext(
BrowserContext* browser_context);
patches/content-renderer-render_frame_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a78389df7d259770007bdae8615072e81cc8513e..ca11cfcbc7c7b06096e620211ce152e32bf4c117 100644
index 584ae29be139c9be347e4fa9f920a2cc84baf00a..fe2a7941f238434592f127340284f69e08ea325d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4577,6 +4577,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
@@ -4576,6 +4576,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
// Temporarily return early and fix properly as part of
// https://crbug.com/426555.
if (web_view->MainFrame()->IsWebRemoteFrame())
patches/content-renderer-render_thread_impl.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 821c1fa871211eaff382702006173309b8b1ceb3..a08cc45e7810963829d28cfa0906f5272f47973d 100644
index b17ed635d6d18c31ae469cd4b9dfe0a5b2940075..12c52c7ef258bec3f712cb8abc416083a9714b0c 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -941,6 +941,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
patches/google_apis-google_api_keys.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc
index f63d9dc0b0d3995a355fc8ee8257b149574d0544..9f90dba0bf7810ad0679a1f7cd994b6655d00ae6 100644
index 454d247d11497967d5a611f0c0ada62dafcd5890..cde6d1ec19b5f9a4ede128be6425a91bb1e1ccd8 100644
--- a/google_apis/google_api_keys.cc
+++ b/google_apis/google_api_keys.cc
@@ -216,6 +216,7 @@ class APIKeyCache {
@@ -225,6 +225,7 @@ class APIKeyCache {
#if defined(OS_IOS) || defined(OS_FUCHSIA)
void set_api_key(const std::string& api_key) { api_key_ = api_key; }
#endif
patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index 9e642a1c2b24c2fcb4a2152fbb4fb1d94a3de8b6..2322055621294728a9e0b7642af80fc766ee6ccb 100644
index 0589690f634ab15c3448485ecbbb9da180d9a15d..16924755c676572da8f0334b0aaffd1c721745cf 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -299,6 +299,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -301,6 +301,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Preference related to the browser sign-in policy that is being deprecated.
registry->RegisterBooleanPref(kSigninAllowedByPolicy, true);
patches/mojo-public-tools-mojom-mojom_parser.py.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py
index 74beb077dab965105b35177d3ef89572fde55294..d27209e142763f04d029cd5f7a879596f9b734b0 100755
index 6a4770afb3b855e12b421bf511fc265058f3c469..591ef9a4b4d0ec7b4968f8ca68b012a6265d57ec 100755
--- a/mojo/public/tools/mojom/mojom_parser.py
+++ b/mojo/public/tools/mojom/mojom_parser.py
@@ -178,6 +178,7 @@ def _ParseAstHelper(mojom_abspath, enabled_features):
patches/net-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 035c14b99e153ea2b0ee194faa6fa07cd7767760..8a38ffd585a1a02d78cc1f26626d18daf6a86ad4 100644
index 973067d14cd345dc38dd79a40f6d6954f05ede23..b2f9bd9c0f89de46255684226974ef0f1f93d790 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1139,6 +1139,7 @@ component("net") {
@@ -1137,6 +1137,7 @@ component("net") {
"reporting/reporting_uploader.h",
]
}
patches/net-cookies-canonical_cookie.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
index 845d2a9973d72a82694b4a2fa8a30a19cc00a142..0343c543dba42f3bc3e66a8f0fc778636fbc7bce 100644
index f4056c6e6caf265375469c6389ec1f87b616c5c3..1511318c960de4f5030817e975b4da2fe3b715d3 100644
--- a/net/cookies/canonical_cookie.cc
+++ b/net/cookies/canonical_cookie.cc
@@ -543,6 +543,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
@@ -542,6 +542,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
// Get the port, this will get a default value if a port isn't provided.
int source_port = url.EffectiveIntPort();
patches/net-dns-host_cache.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc
index 6a66063175431249387bc7b41fc6b266c0de722d..926302b1011b80d09bde3e33b59ca30c9171153c 100644
index 15958b7d4bcdd0632368c04e0b1aae8e3a085bdd..9effb75b09b5339917fcfec44e2fc1d8a43218f3 100644
--- a/net/dns/host_cache.cc
+++ b/net/dns/host_cache.cc
@@ -259,6 +259,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
@@ -260,6 +260,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
}
copy.set_hostnames(std::move(hostnames_with_port));
}
patches/sandbox-policy-win-sandbox_win.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
index 2db3ac677dd9570945402d7a277237cae64351fc..a69e4250297baa5e100e25af82d9892c994d99f9 100644
index ba6823504604def9e2adac8eac041daf57845741..2af477c9adb4fbea47ef5098807fb2cac775ba3c 100644
--- a/sandbox/policy/win/sandbox_win.cc
+++ b/sandbox/policy/win/sandbox_win.cc
@@ -778,6 +778,7 @@ ResultCode LaunchWithoutSandbox(
@@ -771,6 +771,7 @@ ResultCode LaunchWithoutSandbox(
base::Process* process) {
base::LaunchOptions options;
options.handles_to_inherit = handles_to_inherit;
patches/services-network-public-cpp-cors-cors.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc
index 9885d83c5e0f3c00b517cbcf68d68dabb5db40ab..16aaf29be3fc1f53ec87144a0b19a0bd32a232bd 100644
index af768ddd8c37e15ff97ae2b27f5becc13e81f67c..61b3594251ba78c960734b208c496abf42ef43ff 100644
--- a/services/network/public/cpp/cors/cors.cc
+++ b/services/network/public/cpp/cors/cors.cc
@@ -347,6 +347,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
@@ -345,6 +345,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) {
// was introduced to enable safely experimenting with sending a reduced
// user agent string in the `User-Agent` header.
"sec-ch-ua-reduced",
patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni
index 4f7f0eda6d82b9a803e437de82ee33c5bbc7d920..32749c1a1925b8ca2ad34614298ad61ecc7f34e6 100644
index 01fde62fe6b6c33d03cad709db309b9179f5ed19..c451c4b36e9f86424084e04b757d0fac4e782269 100644
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -2500,6 +2500,7 @@ generated_interface_sources_in_modules = [
@@ -2496,6 +2496,7 @@ generated_interface_sources_in_modules = [
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h",
]
patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni
index db667d4eae67ce72455209864cccaf2f00d4a239..49cdfa7f1f326bcd0cefbd788a67eca115c15e01 100644
index 70e4ca0f60b13c6c8b39004cf6f04dd7c513444f..17a38f4b78248f47841990a044acb8d50b611dad 100644
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -1145,6 +1145,7 @@ static_idl_files_in_modules = get_path_info(
@@ -1143,6 +1143,7 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl",
],
"abspath")
patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
index 988b22519e912855bc90e9a3372d72b8e1a508fe..d9cd534e9d040e3c93a60ee5205275ec14904d2e 100644
index 7206e7f8e638f5e6f77b222fc3e27f3646e2d494..35aae9c3146b4fc2926d0ca89227f915b5ff624c 100644
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
@@ -1003,6 +1003,7 @@ String HTMLCanvasElement::ToDataURLInternal(
@@ -1009,6 +1009,7 @@ String HTMLCanvasElement::ToDataURLInternal(
if (!data_buffer)
return String("data:,");
patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
index a108a3797dc0a39be4171051f795f8de26b61d8f..7b1c2c3b12c4a6f9fc57c12173146106363c0880 100644
index 20b27dc45dedb6c1436c9f92cab110336bc73fe6..6f2aa38647655b19858023a3f47b45b34d7da7dc 100644
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
@@ -321,6 +321,7 @@ class CORE_EXPORT HTMLCanvasElement final
@@ -316,6 +316,7 @@ class CORE_EXPORT HTMLCanvasElement final
bool IsPlaceholder() const override { return IsOffscreenCanvasRegistered(); }
patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
index f3d76a6b68a75173d9ad71ad3978e07d9f71371c..7940308a2ffdf9fa50d78703e04034bc3908c21e 100644
index 363e174bdf4aad61c245a070bcf5d1be22cc3432..c9a0c401d5bc9600cdb1a886231bf15a926d6b3b 100644
--- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
+++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
@@ -63,6 +63,7 @@ bool ComputeLockPendingUserGestureRequired(const Document& document) {

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