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

Updated patches from Chromium 94.0.4583.0 to Chromium 94.0.4589.2.

Browse Source
This commit is contained in:
Mario Sanchez Prada
2021-09-13 14:53:03 -04:00
committed by mkarolin
parent 5e6d23163e
commit 9686dfaaaa
94 changed files with 177 additions and 177 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 d82c87861fa7cf66c2849ae350d5823cf00db5e4..5d65d3d918851652ed1cdfd2cc08f37bb883c5cc 100644
index 3a05279377caf15c3afaf5b722f10cebbdb8dbeb..24992b013a029d826441bc5832564ec837492658 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -3960,6 +3960,7 @@ if (is_android) {
@@ -3989,6 +3989,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/TaskTraits.java",
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
]
patches/build-config-android-config.gni.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 898d9e82f74bfd0986694da66bbc13db72aab1f9..6915e913794115ebb6eec4f9066031e00d984a41 100644
index e7540e8be1e015b6902b333b3d4c2d157ef62733..a9ae163577d11eb0aede1cea9a171567b48c3605 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -3,6 +3,7 @@
patches/build-config-compiler-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index b77f1762153b9259c9b44b9ce2fbc7dc15df839f..e0b7a0a4701b8ca26df1199b1162a1371d1e3e22 100644
index 6bfbd46d0c894e20484d807e8b324b00fa2bfded..2b7e49e6ecfc8fc79f66a470fdabb5ca6d56ae42 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1732,6 +1732,7 @@ config("chromium_code") {
@@ -1730,6 +1730,7 @@ config("chromium_code") {
cflags += [ "-Wextra-semi" ]
}
}
patches/build-util-android_chrome_version.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
index c06bb38b74b7f8c4e02186d7056ee4a05a2dae04..fcfaecf1f64a198a7a4e6e1e239a4f63e2767f98 100644
index 5ec9e48d15e56116a4e9f8bdc202b1d30a5acc81..d7420843084accd5c04447f2485084a63e57f464 100644
--- a/build/util/android_chrome_version.py
+++ b/build/util/android_chrome_version.py
@@ -191,7 +191,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
@@ -194,7 +194,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
"""
base_version_code = int(
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 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6dfb8c0d94 100644
index 65499c52e8357f9f91f88fff4bb8f1d5d8e280c3..a0f151a3a05da3f2c0a752b855c1c6ad9e36a8f4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -247,6 +247,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 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d
}
if (enable_vr) {
@@ -595,6 +596,7 @@ android_library("chrome_java") {
@@ -601,6 +602,7 @@ android_library("chrome_java") {
deps += feed_deps
deps += web_feed_deps
@@ -18,7 +18,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d
srcjar_deps = [
":autofill_verification_status_generated_enum",
@@ -626,6 +628,7 @@ android_library("chrome_java") {
@@ -632,6 +634,7 @@ android_library("chrome_java") {
"//components/offline_pages/core:offline_page_model_enums_java",
"//net:effective_connection_type_java",
]
@@ -26,7 +26,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -746,6 +749,7 @@ java_group("chrome_all_java") {
@@ -752,6 +755,7 @@ java_group("chrome_all_java") {
"//chrome/android/features/tab_ui:module_desc_java",
]
}
@@ -34,7 +34,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d
}
# This is a list of all base module jni headers. New features should add their
@@ -788,6 +792,7 @@ group("jni_headers") {
@@ -794,6 +798,7 @@ group("jni_headers") {
"//components/ukm/android:jni_headers",
"//components/webauthn/android:jni_headers",
]
@@ -42,7 +42,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -2059,6 +2064,7 @@ if (current_toolchain == default_toolchain) {
@@ -2067,6 +2072,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -50,7 +50,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
if (webview_includes_weblayer && !_is_bundle_module) {
@@ -2452,6 +2458,7 @@ android_library("base_module_java") {
@@ -2463,6 +2469,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 47fdb198525deb7089dc0b347a87c76cc68b89b1..3df29a1c54f2005c4be26ca5ff9abb42e76a3162 100644
index dc6bf8fb941ca86fea063b743a3c92114157d2bc..0bfd82bfb225a6b3fa2d647c4f0ad33231deb415 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1263,3 +1263,4 @@ chrome_java_sources = [
@@ -1262,3 +1262,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
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml
index 57d9b134dbe5be0cac2369c335533d11f81405d5..79b806032507b9039789642eefc619f8c5e74aee 100644
index 37462070671edf190b316b5201bd516c4e6b5a24..934a56781fc326a232e36e3de894adcd2decc5f6 100644
--- a/chrome/android/expectations/lint-suppressions.xml
+++ b/chrome/android/expectations/lint-suppressions.xml
@@ -122,6 +122,7 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
@@ -121,6 +121,7 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
<ignore regexp="chrome/browser/ui/android/strings/ui_strings_grd.resources.zip/values/android_chrome_strings.xml"/>
<!-- This string has a % in it. -->
<ignore regexp="data_reduction_promo_infobar_title"/>
@@ -10,7 +10,7 @@ index 57d9b134dbe5be0cac2369c335533d11f81405d5..79b806032507b9039789642eefc619f8
</issue>
<!-- Many .xtb files have a % that is not part of a formatted string.
https://crbug.com/941164 -->
@@ -277,4 +278,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
@@ -276,4 +277,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md
<!-- Discussed in crbug.com/1069204, ignoring this class of errors since these are Q+ constants. -->
<ignore regexp="Must be one of: LineBreaker.BREAK_STRATEGY_SIMPLE, LineBreaker.BREAK_STRATEGY_HIGH_QUALITY, LineBreaker.BREAK_STRATEGY_BALANCED"/>
</issue>
patches/chrome-android-java-AndroidManifest.xml.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 53e51641581b7bcc67493ebd168dfaad0288b197..def42c1b09b6dc589e6d874290935e65ac86bb0d 100644
index e9c636360b3555da4e96cff484f1b7c786e38e17..a2eaaaba16a0a71fa90115d2c215f59a9d35acad 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -56,7 +56,9 @@ by a child template that "extends" this file.
@@ -73,7 +73,7 @@ index 53e51641581b7bcc67493ebd168dfaad0288b197..def42c1b09b6dc589e6d874290935e65
{% block extra_application_definitions %}
{% endblock %}
{% endmacro %}
@@ -1286,6 +1300,7 @@ by a child template that "extends" this file.
@@ -1298,6 +1312,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 8e68176000c87d417e4cbf9455b2ecbe54af2555..c01723beb2fc09abfa553602bdea2d99771242ae 100644
index de7ec68edbbb8a484903c8799a002e6e1b7c3c7c..0fdd6aac99fddc4bf943b717c1ef44cf33f92ecb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -2295,6 +2295,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -2296,6 +2296,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
}
private void hideOverview() {
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 d00939a1c39de0f16deb1e78bb95ebb7a1f6b4c3..87f5e9e422d7b0674021acc0ffd9f250fb04c474 100644
index 7bc3749df6505434449c6475c5cc1744e66edd7c..336d861a04b578a43f5b41712b419d23fe1f497f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2474,6 +2474,7 @@ static_library("browser") {
@@ -2476,6 +2476,7 @@ static_library("browser") {
"performance_monitor/metric_evaluator_helper_posix.h",
]
}
patches/chrome-browser-about_flags.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 080b551b8b1003dde1a010d514580b37bdf8648e..fc402d6d9c015e76b482a2f989b400c882741653 100644
index c1fbcf1a6bdae33d5227924ab9388ceaf817ec19..9dae25a410758cda3e96d99c052e1b149bf70f47 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -314,14 +314,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -21,7 +21,7 @@ index 080b551b8b1003dde1a010d514580b37bdf8648e..fc402d6d9c015e76b482a2f989b400c8
const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
@@ -7598,6 +7598,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7672,6 +7672,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-browsing_data-chrome_browsing_data_remover_delegate.h.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index d1e8ba04ca09a8a43dcfab32e564e123720c6687..9086d134b124fbbc628cceb1562a7b402f466138 100644
index cdc212600be6a6c771e0c01294f128f3ce620bfe..deaeeead20fb9f7cc852fef04de1f990f3965353 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -81,6 +81,7 @@ class ChromeBrowsingDataRemoverDelegate
@@ -82,6 +82,7 @@ class ChromeBrowsingDataRemoverDelegate
void OverrideDomainReliabilityClearerForTesting(
DomainReliabilityClearer clearer);
@@ -10,7 +10,7 @@ index d1e8ba04ca09a8a43dcfab32e564e123720c6687..9086d134b124fbbc628cceb1562a7b40
private:
using WebRtcEventLogManager = webrtc_event_logging::WebRtcEventLogManager;
@@ -128,7 +129,8 @@ class ChromeBrowsingDataRemoverDelegate
@@ -129,7 +130,8 @@ class ChromeBrowsingDataRemoverDelegate
kAccountPasswordsSynced = 38,
kAccountCompromisedCredentials = 39,
kFaviconCacheExpiration = 40,
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 7faa61f3bc7bcf952a049452d682892346d4838b..7e22cf070cf6ac7ea7c91d1fc4381e709216afbb 100644
index d76dba7bb5a4d92accee0cd18f4b25de45a7d2e5..4d24b90daecc7c7e70e0f8652866074a1d1e87d0 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -752,6 +752,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -755,6 +755,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
}
private:
patches/chrome-browser-extensions-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 96af835a2fa8adbab78f4f720080e73d612c899e..c8a9ba22d73c43d4a74309a8a29bb32e2dc51298 100644
index cc78a9f8197f7b9c672bbfcea135b7b891bea6ab..8ce0628f13a93a6dd9868ad327881e909e35073a 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1313,6 +1313,7 @@ static_library("extensions") {
@@ -1314,6 +1314,7 @@ static_library("extensions") {
} else {
sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
}
patches/chrome-browser-extensions-extension_service.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 376fb4111ba8e46da83480775304d1218ab8f9c4..4a8abed1c22bd4a84165654626fc0ddb97076b1c 100644
index aa2beca595cab77452532edfa930a1d9012900fa..48cb7a070c11614472ba297aea7e410f1d8b5c0a 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -457,6 +457,7 @@ class ExtensionService : public ExtensionServiceInterface,
patches/chrome-browser-extensions-extension_tab_util.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 1d3c4d4171e0cc6828ff857e37e68c3dcdeceb61..82b80dd901a05a3b91af87f620f9c97e55060fa6 100644
index cd5670f4eadf4a3f7314e84a1ac6ad914a11550a..6a871f9421c0a4fdf36a2a80a44cdec81b973cd3 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -794,6 +794,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
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 04d00fcabba368a4b8ec9361661b2d0c5b2f9c82..8a6bfb6265f81533ff6ecf702beecdf58398b5fb 100644
index c0b1327f685546a983c43550bf257fdc2dc134c1..d35b6987e99fe6b732246abdbd6f9eeabee4755c 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -338,6 +338,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -340,6 +340,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
};
const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
patches/chrome-browser-prefs-browser_prefs.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2f10fe805ce244d2ccc7c0fe39a09bebdd3907df..53199f2d8e48e1e9e3e0998d7aa9613378a8aabe 100644
index 1370d13ba7fbd3f0760332dfdc52c15a1ae760a7..3db9be238d4e3fa2ff70eeb5bd5154f0b8185487 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1057,6 +1057,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1065,6 +1065,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
#if defined(TOOLKIT_VIEWS)
RegisterBrowserViewLocalPrefs(registry);
#endif
@@ -10,7 +10,7 @@ index 2f10fe805ce244d2ccc7c0fe39a09bebdd3907df..53199f2d8e48e1e9e3e0998d7aa96133
// This is intentionally last.
RegisterLocalStatePrefsForMigration(registry);
@@ -1353,6 +1354,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1361,6 +1362,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#endif
RegisterProfilePrefsForMigration(registry);
patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
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 d2bee1977701e3cd0ffb066290ef461e3edf7ff2..bb7df874302927d67aea2af7d2c97d010904af71 100644
index 5ac189c30816ac45a88165097ac4d92a0e11a4e9..d39b83f6773702428dabba92c680cf83af7ca4c5 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1773,6 +1773,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
patches/chrome-browser-resources-bookmarks-bookmarks.html.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/bookmarks/bookmarks.html b/chrome/browser/resources/bookmarks/bookmarks.html
index fbaec388ddf82ae379e3abf66b5f4bb6069ead7b..5ff892de2f6074b1a24a099b5a3fecc186ca8593 100644
index 251e3cb3f0f88067b7d6557dc3128c59dab6e3cb..e1f87a889cf4d4610f9538a6ef2deaf17dec8976 100644
--- a/chrome/browser/resources/bookmarks/bookmarks.html
+++ b/chrome/browser/resources/bookmarks/bookmarks.html
@@ -29,6 +29,7 @@
@@ -30,6 +30,7 @@
height: var(--md-toolbar-height);
}
</style>
patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts
index 52737b6cd6a7d7abeac7d852be61c07f369de4ce..9034d20174bbdb2741a58494fcb3f6adcddce879 100644
index f31b09b3cffe7dc52ce8e15793b0532af7ee96ae..daa36d60a53354859149d51976dc4549f8f71bcd 100644
--- a/chrome/browser/resources/bookmarks/command_manager.ts
+++ b/chrome/browser/resources/bookmarks/command_manager.ts
@@ -437,7 +437,7 @@ export class BookmarksCommandManagerElement extends
patches/chrome-browser-resources-downloads-downloads.html.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html
index a5bb15763aa3820bd3b0a72ec8234c0ba6567b68..0d6b3a42780a9a8bd82d03c33fdab978d051af2c 100644
index e46eff0dab0be1614b4376fce59b8c0beef46142..4d7430498f052eb9d5c76e1e4010360d1a6ae735 100644
--- a/chrome/browser/resources/downloads/downloads.html
+++ b/chrome/browser/resources/downloads/downloads.html
@@ -6,6 +6,7 @@
@@ -7,6 +7,7 @@
<base href="chrome://downloads">
<title>$i18n{title}</title>
<link rel="stylesheet" href="chrome://resources/css/md_colors.css">
patches/chrome-browser-resources-extensions-extensions.html.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html
index 3aa5c713503cdab793fff44c2d9a924cda3c168a..1d4b693b323fd68233decb43a5d6be5e56267c99 100644
index ecc17a85b6ecba98c1bfeb97a88d739289d016c9..ee88b081e49a75bba9a34571ca12659d8ce656bf 100644
--- a/chrome/browser/resources/extensions/extensions.html
+++ b/chrome/browser/resources/extensions/extensions.html
@@ -54,6 +54,7 @@
patches/chrome-browser-resources-extensions-extensions.ts.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/extensions/extensions.ts b/chrome/browser/resources/extensions/extensions.ts
index 5836804c9e488bb23869d05881bd55cd7ccd9f52..928974d8d5dc367276527ae521b26fc3bb7cb226 100644
index 378090e6f4816577f578ac418c5b449e68240ee3..40ae9e27676a5b67b0cf5fcf7f07dffab875ce6b 100644
--- a/chrome/browser/resources/extensions/extensions.ts
+++ b/chrome/browser/resources/extensions/extensions.ts
@@ -2,6 +2,7 @@
@@ -9,4 +9,4 @@ index 5836804c9e488bb23869d05881bd55cd7ccd9f52..928974d8d5dc367276527ae521b26fc3
+import './brave_overrides/index.js';
import './manager.js';
export {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js';
export {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js';
patches/chrome-browser-resources-history-history.html.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/history/history.html b/chrome/browser/resources/history/history.html
index f89232013d3efc189400143cbcc2cf7badbe4a66..70293038b432ab4579eed6a0daa28dde324afe14 100644
index 1d2d7cba4d8d60c945345eae172301d30e1ba38c..0249e8415a6cbadc44f7552f863e633572c2b389 100644
--- a/chrome/browser/resources/history/history.html
+++ b/chrome/browser/resources/history/history.html
@@ -79,6 +79,7 @@
@@ -80,6 +80,7 @@
justify-content: center;
}
</style>
patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/people_page/sync_controls.js b/chrome/browser/resources/settings/people_page/sync_controls.js
index b7f0e2c3c6c4fc26e25870bd5708f0eb16d7569f..7aaf03dc9916ce3af1581bd109f29824c0ea850b 100644
index f9bc9cf75ace2d533478321e6cb067dd4a96846f..b1b03878812444f0949a759089d023ad6f947a7b 100644
--- a/chrome/browser/resources/settings/people_page/sync_controls.js
+++ b/chrome/browser/resources/settings/people_page/sync_controls.js
@@ -124,7 +124,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase {
@@ -11,7 +11,7 @@ index b7f0e2c3c6c4fc26e25870bd5708f0eb16d7569f..7aaf03dc9916ce3af1581bd109f29824
this.browserProxy_.didNavigateToSyncPage();
}
}
@@ -257,6 +257,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase {
@@ -268,6 +268,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase {
* @private
*/
syncControlsHidden_() {
patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js
index 5a8630b3a7c10fce3b0f69a74c54e1c2a8a79f12..d031c337bd1c58a9bf7e49f0735c14d3d88afe1c 100644
index 385bd9f2b4ad253d35c9c84acc0790435f3be11e..c9b8ac78b0abdfa1207c4c584e215840aef4c3d4 100644
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.js
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js
@@ -69,7 +69,7 @@ export class SettingsPersonalizationOptionsElement extends
patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+2 -2
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 ed38a02b447498a52390c4418660d2574efde454..3d1b706c5120c94fa3edf736cd9beb3eff5b7110 100644
index 04b020c902ab05f58bc28647e278b65f9c82da24..4eb2a7df0a57dee58026d933acfa430429fb8f07 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -35,6 +35,7 @@
@@ -26,7 +26,7 @@ index ed38a02b447498a52390c4418660d2574efde454..3d1b706c5120c94fa3edf736cd9beb3e
<template is="dom-if" route-path="/content/camera" no-search>
<settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"
search-label="$i18n{siteSettingsAllSitesSearch}"
@@ -479,11 +482,13 @@
@@ -481,11 +484,13 @@
</category-setting-exceptions>
</template>
<template is="dom-if" if="[[!enableContentSettingsRedesign_]]">
patches/chrome-browser-resources-settings-route.js.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js
index cbadf12cfcdd4c6a48856fe54952875706415229..73ce1aea117b53568f24e1acf23ff9c8d8d9175c 100644
index 932af83be3255912723cc9e4f32f213b81f4e4e9..b2828523e4960b11dcdb40ad3b7eb83b0aa19040 100644
--- a/chrome/browser/resources/settings/route.js
+++ b/chrome/browser/resources/settings/route.js
@@ -7,7 +7,7 @@ import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
patches/chrome-browser-themes-theme_helper.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/themes/theme_helper.h b/chrome/browser/themes/theme_helper.h
index 28ca8e7dfacaea8873ecf60667b29b7551de504a..bbecbefdef3754d589f471057c63851062d08935 100644
index faaf3c0c98c2edeeff3b06c5781a363b93ae1774..d0063c019a9e91c0c972ea45d37b664c2b2fd121 100644
--- a/chrome/browser/themes/theme_helper.h
+++ b/chrome/browser/themes/theme_helper.h
@@ -108,6 +108,7 @@ class ThemeHelper {
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 5fe3d69cc95f3c733abb935a48b63877eb974cfe..7a9f9d7846c60043718c3370a6e262837aa40f52 100644
index 2c834484e26ba5ac4f07bac65452408aa06d790d..0150c89cc8eda1f72d911283e716e3cb570c3cd2 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -620,6 +620,7 @@ static_library("ui") {
@@ -622,6 +622,7 @@ static_library("ui") {
"//ui/webui/resources/cr_components/most_visited:mojom",
"//v8:v8_version",
]
@@ -10,7 +10,7 @@ index 5fe3d69cc95f3c733abb935a48b63877eb974cfe..7a9f9d7846c60043718c3370a6e26283
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [
@@ -3473,10 +3474,13 @@ static_library("ui") {
@@ -3482,10 +3483,13 @@ static_library("ui") {
]
deps += [ "//google_update" ]
} else {
patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
index 8e6034ff20a453d31efae3ee24eab91129651ce4..26b97d098294ca0933807851c20311d5c9e8bf71 100644
index 9645338440f50b55aabd297ae5daceb3801aa7a8..f555edd1f8fdecba973bc14a3985650c2e89f810 100644
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -95,6 +95,7 @@ android_library("java") {
@@ -7,6 +7,6 @@ index 8e6034ff20a453d31efae3ee24eab91129651ce4..26b97d098294ca0933807851c20311d5
"java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java",
]
+ sources += brave_browser_ui_android_toolbar_sources
deps = [
":java_resources",
patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h
index 1fa9f791678d01f09fb96f535268deff947d9c22..24340c8f7436a19ee06272f195e21a0e481ec604 100644
index dec9b145799f8e9e524f0073908b488736f3aa47..0cecf8670a41f0b2c43d4c2290dae2841a03ab6b 100644
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h
@@ -58,6 +58,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate {
@@ -59,6 +59,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate {
// Helper method to get the navigation entry from the navigation controller.
content::NavigationEntry* GetNavigationEntry() const;
patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index ba2c52802e170e37748c89c9f554cc365bdba982..69e290c79f87e0aa502cd9196a04f9abd90bfe5b 100644
index 2731df13bb49c55e27e4f1e0fa29a50e136742ed..7389dad7ddbc08b36d3ee5aebdc4ef2bb900ad66 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -227,6 +227,7 @@ void BookmarkBubbleView::ShowBubble(
patches/chrome-browser-ui-views-download-download_item_view.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
index 406c8b0c1511ec17534ab07ff294f54f8bf1a15b..5a91839bdae28774c78778e64a50cc67e06b552a 100644
index 3c5253624946d3ddd9fcf96f379406bd741b2189..7884e8df3340f8b7659405635b2abbe7d46f0ec5 100644
--- a/chrome/browser/ui/views/download/download_item_view.h
+++ b/chrome/browser/ui/views/download/download_item_view.h
@@ -115,6 +115,7 @@ class DownloadItemView : public views::View,
@@ -118,6 +118,7 @@ class DownloadItemView : public views::View,
void OnPaintBackground(gfx::Canvas* canvas) override;
void OnPaint(gfx::Canvas* canvas) override;
void OnThemeChanged() override;
patches/chrome-browser-ui-views-frame-browser_view.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 02f0019d7d3244f19a0bdf729a757b0142eab9fa..034c0e51f0d9a20675adac48b2c49d681391027a 100644
index 820e06d9d7ff13e53ca20e667d3d7810ceb7b836..41b7a4a633684eddc9ca1ddfcc0600ae1cd29bbb 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -661,6 +661,7 @@ class BrowserView : public BrowserWindow,
@@ -665,6 +665,7 @@ class BrowserView : public BrowserWindow,
return accessibility_focus_highlight_.get();
}
patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index ca31e380a593926dd58ca3342452e7e99c25c278..02d016eb54a943e67331cd2bec8b0583200d3470 100644
index b5a225e7af7b31f0d53bb85721861b64b7184677..0bccd2fc24b1accd53deafe83d90499f9c2d5227 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -652,6 +652,7 @@ void LocationBarView::Layout() {
@@ -653,6 +653,7 @@ void LocationBarView::Layout() {
}
};
patches/chrome-browser-ui-views-outdated_upgrade_bubble_view.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
index 884c739a0cf60db19aba93b418f32949cfa1bc78..00cf052f0ec66db43aeec72ebd869359e2dd3b29 100644
index e9ff57eb7d4d57c0d20b259c0b0c571a4e1b3a81..870376d33740a6b19f921b92fc3bf3a51c0d0396 100644
--- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
+++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
@@ -37,8 +37,11 @@ namespace {
patches/chrome-browser-ui-views-tabs-tab.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index e04fcc294cfc07d03f7e7c22eaeb3d2a14e15c25..847f982210c5780d12033a9dfe046d848154f38c 100644
index db85413cdc25fe981976c72c68a143240b36a71b..766ed626913d9363880185a097f28b5d2759e591 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -385,6 +385,7 @@ void Tab::Layout() {
@@ -384,6 +384,7 @@ void Tab::Layout() {
int title_right = contents_rect.right();
if (showing_alert_indicator_) {
title_right = alert_indicator_->x() - after_title_padding;
patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc
index 277101faac1de8eaefe7d13a9e640615706bfe09..82067014565c264c0663873cef245efc0f4d6ad6 100644
index ab8d254e7bd9aff3d74201ce0e5c75b9418e6e6e..ebf07aa0a7a1a5567b968ffe1eaba59509959ade 100644
--- a/chrome/browser/ui/views/tabs/tab_style_views.cc
+++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -69,6 +69,7 @@ class GM2TabStyle : public TabStyleViews {
patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 9fe383741657c10916b0a706e7ec2a04e15227b0..0e190fa54842101dbb25559a65c39de95998063c 100644
index 7bc5cd3dabf7d2d4f1d59c482a21c5be4167bed2..4b93fb9ca279be0dfd546c9b769a134bf3700453 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -343,6 +343,7 @@ void ToolbarView::Init() {
@@ -346,6 +346,7 @@ void ToolbarView::Init() {
} else {
// TODO(crbug.com/932818): Remove this once the
// |kAutofillEnableToolbarStatusChip| is fully launched.
patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
index 5afc76b3064ecea23db9c9863128d8a04753e2d1..4a20f6c66ed23500b9fe558f3064fdbfe250f641 100644
index 247030e056de07bb7541982561e16f2a08913a25..7cf2e9461e60f31a3b0e9d44eff93e8a8a7ee4fd 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -184,7 +184,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
@@ -190,7 +190,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
source_language, target_language));
std::unique_ptr<TranslateBubbleModel> model(
new TranslateBubbleModelImpl(step, std::move(ui_delegate)));
patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h
index f8685459a875480b5b428bd04a859210316139df..d8ff61490ce2c1c5460a31a485cf024c01123e7c 100644
index 7dd252c22403f44ae537415a984febd752f733d3..ccae89a6e40a83f8cb90c771cbf47769875a2498 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.h
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
@@ -94,6 +94,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
@@ -103,6 +103,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
// Returns the current view state.
TranslateBubbleModel::ViewState GetViewState() const;
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 ee35f2a60fd35eec047768c4ee54b3f23a18bdab..41f75bef40c3c2bb4c29a3049c98ba6eb8f62d0c 100644
index bcc89d121b60383ab1e008815369bb50617d233a..996d6a8547ee842714aca569ee28ca02ef3b7809 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -1199,6 +1199,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
@@ -1209,6 +1209,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
// static
ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc
index 27a60ca6dba52d5a86bc1cee2b46ef7859f02c26..72117c6a080bb7908ced24dc40496763ed688635 100644
index 8f25f8c270ba81519f792796af24e0f337d089d8..421aab10c73938732a73002f8c506a89d5a908ec 100644
--- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
@@ -58,6 +58,7 @@ namespace {
@@ -59,6 +59,7 @@ namespace {
content::WebUIDataSource* CreateDownloadsUIHTMLSource(Profile* profile) {
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIDownloadsHost);
patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
index 894e1da817c01c785dc74661fd4995f1658544bf..def7436b0f25b653e3c17cb1f739fdf3538004b5 100644
index 9476569e6059efb6bfaa603fd2b03972ef1d6d06..1f695848482418ae89e6e0132a56dffa625e770d 100644
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -316,6 +316,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile,
@@ -322,6 +322,8 @@ content::WebUIDataSource* CreateExtensionsSource(Profile* profile,
source->AddString(kLoadTimeClassesKey, GetLoadTimeClasses(in_dev_mode));
patches/chrome-browser-ui-webui-history-history_ui.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc
index 6cb4ecac81cd23fb39ecc86993f75df1c8e152a7..0f2b0cedb40a03754f48ba74399756c330485615 100644
index d08af7abe6de08ef81534328aa5e323e8f8d402f..3a6a376378e3f508b59fa98e40b5b9a8dc57ffe3 100644
--- a/chrome/browser/ui/webui/history/history_ui.cc
+++ b/chrome/browser/ui/webui/history/history_ui.cc
@@ -55,6 +55,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
@@ -60,6 +60,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
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 953f87316d1c07f83c5a441cdc134317d5966e94..8d1878459119e2e18b5c6926eab88e55fac30715 100644
index b61ac45a94629edb26e568fd829fb0170c93abac..95ec6e770e97accca88db398a7b34b413ded59c9 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -2791,6 +2791,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -2782,6 +2782,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);
patches/chrome-browser-ui-webui-theme_source.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 4872b19446e4615e54f52e999d14b0d055d1bb79..c13414b65e5f09903f88842923a1f6e4d7161a81 100644
index d740ff815b90fa01a8bb82886c09bdf6e7990631..6e67880bf69d2f6ba99a98440aea0a3767c141d6 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -100,7 +100,7 @@ void ThemeSource::StartDataRequest(
patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
index 2e9c2ad3e29ed620299dadb9cd56f37ac4cfe245..45a3f00be129b9513a5152f6d0dfa2aa0834aece 100644
index e301bb873774b9e0eb1d82b1cda3e689e9474eb9..6d084af7d79226ce68f3392b18b3200f2ddfc716 100644
--- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
@@ -488,7 +488,7 @@ void UpgradeDetectorImpl::Init() {
patches/chrome-common-BUILD.gn.patch
+7 -7
View File
@@ -1,20 +1,20 @@
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index bc6070aa64d712a489fce6054a2544955c901f36..f26d555af950cf1bc7d29f980a4c951144a25abb 100644
index 7931729db965b2dc05cbab2a21fdc3c8226ccc55..dc033f732a76f6df4626291b5256dd36c8304a58 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -81,6 +81,7 @@ source_set("channel_info") {
} else if (is_posix) {
sources += [ "channel_info_posix.cc" ]
@@ -83,6 +83,7 @@ source_set("channel_info") {
} else if (is_fuchsia) {
sources += [ "channel_info_fuchsia.cc" ]
}
+ public_deps += [ "//brave/common:channel_info" ]
}
source_set("ini_parser") {
@@ -548,6 +549,7 @@ static_library("non_code_constants") {
@@ -549,6 +550,7 @@ static_library("non_code_constants") {
"//printing/buildflags",
"//ui/base:buildflags",
]
+ configs += [ "//brave/common:constants_configs" ]
}
component("chrome_features") {
patches/chrome-common-extensions-chrome_extensions_client.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index e45a588cade57ba820ca8c4fda91dc415024378f..fb21e5825efc3867643d1c49e141cac50dfb02e2 100644
index a15c7c43bfa09265ef1bf723be0a63ea8195bd39..07a4df3f63be14c3afcc3bda34a4c1212ebf10f5 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -13,6 +13,7 @@
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 64f961a0a4162b713d51e577da2f340ad0dadfb2..8cd98452b02177ec5f5cf872df5031edac0ddf6e 100644
index 409a433206d66dc08b18222df6771018b7c321c5..9e8dadc8fc379dd192c880d5bfad4ebb16be962b 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 64f961a0a4162b713d51e577da2f340ad0dadfb2..8cd98452b02177ec5f5cf872df5031ed
-e "s#@@SNAPNAME@@#${SNAPNAME}#g" \
-e "s#@@PROGNAME@@#${PROGNAME}#g" \
-e "s#@@CHANNEL@@#${CHANNEL}#g" \
@@ -162,6 +163,8 @@ stage_install_common() {
@@ -163,6 +164,8 @@ stage_install_common() {
install -m 644 "${OUTPUTDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
fi
@@ -19,7 +19,7 @@ index 64f961a0a4162b713d51e577da2f340ad0dadfb2..8cd98452b02177ec5f5cf872df5031ed
# ICU data file; Necessary when the GN icu_use_data_file flag is true.
install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
@@ -317,11 +320,13 @@ stage_install_common() {
@@ -318,11 +321,13 @@ stage_install_common() {
# app icons
local icon_regex=".*product_logo_[0-9]\+\."
patches/chrome-installer-linux-debian-changelog.template.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/linux/debian/changelog.template b/chrome/installer/linux/debian/changelog.template
index 290128804a9a724e9b04ea57be59ce34a0154b42..10bc5a2103ad635da11b37033cfa852eb9ebfb76 100644
index 17d097b4506739cd917d49a5ec2132e5ccdc9859..38fff15cea1c5cb9da9c28f76445e36a52fa88ff 100644
--- a/chrome/installer/linux/debian/changelog.template
+++ b/chrome/installer/linux/debian/changelog.template
@@ -1,5 +1,5 @@
@@ -9,4 +9,4 @@ index 290128804a9a724e9b04ea57be59ce34a0154b42..10bc5a2103ad635da11b37033cfa852e
- * Build spec: https://chromium.googlesource.com/chromium/src.git/+/@@VERSION@@/
+ * Build spec: https://github.com/brave/brave-browser/releases/tag/v@@VERSION@@
-- @@MAINTNAME@@ <@@MAINTMAIL@@> Tue, 03 Feb 2009 14:54:35 -0800
-- @@MAINTNAME@@ <@@MAINTMAIL@@> @@DATE_RFC5322@@
patches/chrome-installer-setup-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
index db3796b6b6ef7c7c60cd6d75e93259c1a5edc364..e6fa111a618efea3ff70b55b75ed9c9297c4d040 100644
index 0b4f0b5678b40b156838b8279de573b672e6f399..fd8ecdfecfaa0d7ff77ed625ef9505693c6b40be 100644
--- a/chrome/installer/setup/BUILD.gn
+++ b/chrome/installer/setup/BUILD.gn
@@ -49,6 +49,7 @@ if (is_win) {
patches/chrome-installer-util-BUILD.gn.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
index 7e36bd570a88c78d61718bc2dd9e8c526d1fca3d..3f8342ecb2516ab2798812f1bbfbfc35df66dbee 100644
index d37b68d1b683ea4105a4c6f06913244d380222cf..38a655dcfe356f59c450a67b16bbbde83cec5086 100644
--- a/chrome/installer/util/BUILD.gn
+++ b/chrome/installer/util/BUILD.gn
@@ -190,6 +190,7 @@ static_library("with_no_strings") {
@@ -191,6 +191,7 @@ static_library("with_no_strings") {
"initial_preferences.h",
]
}
@@ -10,7 +10,7 @@ index 7e36bd570a88c78d61718bc2dd9e8c526d1fca3d..3f8342ecb2516ab2798812f1bbfbfc35
}
# Use this version of installer_util to link to the generated strings in .rc
@@ -225,7 +226,18 @@ generate_embedded_i18n("generate_strings") {
@@ -226,7 +227,18 @@ generate_embedded_i18n("generate_strings") {
output_file_name_base = "installer_util_strings"
patches/chrome-installer-util-shell_util.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 5b1d1c9a78b57d0c2b30828a87fc68d6fc701973..778e6119b3f2d496719b89c0ffb814126892e92f 100644
index e22ef8b926d9e2485114f1bf182afedf0c095b27..78569569a45fe9ceac5c9a35e0ddee347e6a0a5f 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -355,6 +355,7 @@ void GetChromeProgIdEntries(
@@ -34,7 +34,7 @@ index 5b1d1c9a78b57d0c2b30828a87fc68d6fc701973..778e6119b3f2d496719b89c0ffb81412
return L"SettingsPageAppsDefaultsProtocolView";
}
@@ -1628,8 +1632,10 @@ const wchar_t* ShellUtil::kPotentialFileAssociations[] = {
@@ -1676,8 +1680,10 @@ const wchar_t* ShellUtil::kPotentialFileAssociations[] = {
L".htm", L".html", L".pdf", L".shtml", L".svg",
L".xht", L".xhtml", L".webp", nullptr};
const wchar_t* ShellUtil::kBrowserProtocolAssociations[] = {L"ftp", L"http",
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 b0ca538ec58e08704922342e7d2aa90c8f3d5577..c47eaafd6921d910591e2989fb81fdf3c5e9e8f5 100644
index 813a98c0c580fe3f077e7fe2abc37992b466f8f5..758e46995650ec61382b962e7684619eb5372d1c 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -235,6 +235,7 @@ static_library("renderer") {
patches/chrome-renderer-chrome_content_renderer_client.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 4cd049fba2741bd14344128387e84b61cae00236..67a1cf02f77c3cac5782a5a53254b21490ec44f3 100644
index 0b2a9df9d6979d4bb8f37d884b56f596d17b2941..65ecc973f218246af3cb92fa99e7219ec73f61e7 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -519,7 +519,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
patches/chrome-test-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 5b9bff5bbbd49cb2ae74cf0d3ea563e5217f56e5..869b9d8b8a2af1f1a81d4c47780d00591df2321a 100644
index 4800f267f10a186b675bba286ec53770db4ebe5d..f43a225583be006612262ceda928a4fcafc2bf55 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1293,6 +1293,7 @@ if (!is_android) {
@@ -1288,6 +1288,7 @@ if (!is_android) {
"//v8",
]
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 1cc9403039be4060509a05f6ab8190bc541b8e74..fd0104a1d12101d58ea0245e59e73ac9e390e1df 100644
index de2ba5cc8cc89595ef0948e19e5adabb0bf44fe3..61dcbeaed6ef19ba2070c8f608edbd7927a39ee0 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -65,6 +65,8 @@ static_library("utility") {
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 4bb4ad71cc1b3e4776266dce41ed6e67e6d1ca5b..8f7b7f52f7286e0ca6088d11540cc449e75e68ca 100644
index 53e963234f6aa900d8617ad62ca095a0a623f07f..6314c5cc8bcda33c0bcc2fb4627071aead78ee66 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -264,6 +264,7 @@ enum class ContentSettingsType : int32_t {
@@ -266,6 +266,7 @@ enum class ContentSettingsType : int32_t {
// Whether to use the v8 optimized JIT for running JavaScript on the page.
JAVASCRIPT_JIT,
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 7833a3eb78cf157048bdd8fda7987ba3ec796877..eb9739dc513fa493c020f8011444c41708f3200f 100644
index aeccafb94d3b523a9159411a89ea3a17c08f52ad..8e3e1d4924b900efd7570373ddde5bc7305d76fc 100644
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -999,6 +999,7 @@ void PageInfo::PresentSitePermissions() {
@@ -966,6 +966,7 @@ void PageInfo::PresentSitePermissions() {
}
}
patches/components-password_manager-core-browser-login_database.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
index 6c35ac58ae886b8dd32cdd9303cd1bfad1156b84..58bc68e372c03a3df1b10a6ad3ee3eb724d037cd 100644
index 90b536254e6103833d6febe0c814c712bc85d2f1..72a91c6ced55d2c463ce629ae6396105485bb7a3 100644
--- a/components/password_manager/core/browser/login_database.cc
+++ b/components/password_manager/core/browser/login_database.cc
@@ -2098,6 +2098,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
@@ -2068,6 +2068,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
EncryptionResult result = InitPasswordFormFromStatement(
*statement, /*decrypt_and_fill_password_value=*/true, &primary_key,
new_form.get());
patches/components-permissions-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
index 5b6894233a31a1c989c4c97a6dd6591ecf9c48b1..209b63455ba0ff21b031f5df69beee464eb788da 100644
index 5bd511c6824689339cc2340306fc693d189854a7..50e8615fa8d057a5cbfdf22aced95e0c9ea6086f 100644
--- a/components/permissions/BUILD.gn
+++ b/components/permissions/BUILD.gn
@@ -127,6 +127,7 @@ source_set("permissions") {
@@ -129,6 +129,7 @@ source_set("permissions") {
"contexts/geolocation_permission_context_mac.h",
]
}
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 96b9ad8794b43ca71c86a6c8b49dad412c89cae6..00754f1105670b9c96db742df3aa19d83120b5bd 100644
index 0e7fcfa6f3c92faddb050461678d68f8174ea1d3..2af833199561f9b50f03559886411cfb4a075d1b 100644
--- a/components/sync/driver/sync_service_impl.h
+++ b/components/sync/driver/sync_service_impl.h
@@ -251,6 +251,7 @@ class SyncServiceImpl : public SyncService,
patches/components-sync-engine-model_type_worker.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync/engine/model_type_worker.h b/components/sync/engine/model_type_worker.h
index a2ee15b2842a30437519196547bc67a161434ea7..a596d1b562a06dec774f3dfcdb2322df0f42c5ab 100644
index 87239469cc6677c5f3be7ce6d44497f3fa9c091d..83ba868e45655ef447877d9e5abced768d03f64b 100644
--- a/components/sync/engine/model_type_worker.h
+++ b/components/sync/engine/model_type_worker.h
@@ -156,6 +156,7 @@ class ModelTypeWorker : public UpdateHandler,
patches/components-sync-protocol-proto_visitors.h.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h
index 9f3ef8d35c68f77dd5fd77aa751c67de578d5dc5..d2fd0af01a199fc722bd1d57d51851e71f5d6193 100644
index 17ace4df93406ade8559fb4755f727ed5498d0de..36f2566ecc2c9a239d8ede0bad37ee321bf4f591 100644
--- a/components/sync/protocol/proto_visitors.h
+++ b/components/sync/protocol/proto_visitors.h
@@ -391,6 +391,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
@@ -395,6 +395,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
VISIT(manufacturer);
VISIT(last_updated_timestamp);
VISIT(feature_fields);
@@ -10,7 +10,7 @@ index 9f3ef8d35c68f77dd5fd77aa751c67de578d5dc5..d2fd0af01a199fc722bd1d57d51851e7
VISIT(sharing_fields);
VISIT(invalidation_fields);
VISIT(paask_fields);
@@ -403,6 +404,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) {
@@ -407,6 +408,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) {
VISIT(send_tab_to_self_receiving_enabled);
}
patches/components-sync-protocol-protocol_sources.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni
index dc3c50a7311668bec83aa15fcc8e4a34b27dbb6e..6364dbebf776dd5eb28d97cc8d44894323dbf055 100644
index b5ea425adbe76c9a8cb82b7c65fd8833a99fded1..9c478f8f26760e83b56e752eb395fdca832f8821 100644
--- a/components/sync/protocol/protocol_sources.gni
+++ b/components/sync/protocol/protocol_sources.gni
@@ -77,3 +77,4 @@ foreach(base, sync_protocol_bases) {
@@ -79,3 +79,4 @@ foreach(base, sync_protocol_bases) {
sync_protocol_pyprotos +=
[ "$root_out_dir/pyproto/components/sync/protocol/${base}_pb2.py" ]
}
patches/components-sync_device_info-device_info_sync_bridge.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc
index 950a3397936b36bb8aa965c29d709bc3fb43c39b..8a0bfeb51c196e144093fffbcb26e4d6710c3a07 100644
index 4b1a692fe1e58f9f4f92c2c0b1b3fa567490e930..3d7bf45caeb73a8967b447a435ab3a0bd342ea61 100644
--- a/components/sync_device_info/device_info_sync_bridge.cc
+++ b/components/sync_device_info/device_info_sync_bridge.cc
@@ -259,6 +259,7 @@ std::unique_ptr<DeviceInfoSpecifics> MakeLocalDeviceSpecifics(
patches/components-translate-core-browser-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn
index c9415a06f38e7120244ea91ddb0cb87bdba2fa3f..c55f49c5e239b2fd19fffecd64bf7a4795cce09d 100644
index ebf718409b2eab70d889addbf828d3ab646dc1fb..f3fbc4fb5bb4ff7532fff3f5751dce10139220a1 100644
--- a/components/translate/core/browser/BUILD.gn
+++ b/components/translate/core/browser/BUILD.gn
@@ -86,6 +86,7 @@ static_library("browser") {
@@ -85,6 +85,7 @@ static_library("browser") {
]
deps += [ "//components/infobars/core" ]
}
patches/components-variations-variations_seed_store.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc
index fd067904a6d93f29f070c60255c520e727f4c63a..a8066e9137d36a515c3cc63bc971589b5f997840 100644
index 5f0a27e90996df17a984c6cc26c5ad689db7d60d..731f8c4502f33430fb27d4cd29e689430aabccec 100644
--- a/components/variations/variations_seed_store.cc
+++ b/components/variations/variations_seed_store.cc
@@ -35,6 +35,7 @@ namespace {
patches/content-browser-renderer_host-navigation_controller_impl.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index b49a0ee27c2df9c171c99afd101cc834a8d50109..f1fa471ab4f6a8c00a47376bf8d195934885a3f6 100644
index 8f768ecd47913e0fcc5a66cf07a6b73469fc9538..9e35a48d152946411309c0409b85066870a8e4b1 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3141,16 +3141,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
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 6b06ce27f3fffef15060e7426a46cc524562848d..b58a62a8c16da37dc8d7d77ea1b03e7448cf9bc4 100644
index b3c31629d896c9674e63b2e000fec3a70cdc4169..107e3ed4d4e972c400a9bca787029b939b075b9d 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2371,6 +2371,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -2390,6 +2390,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 6b06ce27f3fffef15060e7426a46cc524562848d..b58a62a8c16da37dc8d7d77ea1b03e74
common_params_->referrer = Referrer::SanitizeForRequest(
common_params_->url, *common_params_->referrer);
@@ -3600,6 +3601,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -3619,6 +3620,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();
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 4f09c48e4c3b1d8f44854ca0823fad89c7cb11ca..49ec9baf63c72c196bad5b870ad59d4545c02a51 100644
index b0d68dc86bfb32f528bb392c6fe8d5c60805a41b..17cdb76b414f5a0ec4bd62df94943925296140cd 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4468,6 +4468,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
@@ -4474,6 +4474,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
// Temporarily return early and fix properly as part of
// https://crbug.com/426555.
if (web_view->MainFrame()->IsWebRemoteFrame())
patches/extensions-browser-sandboxed_unpacker.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
index 5b7ec4d374c179496ac097250b29f07596eafb9f..4a025b4b2a6d81dafd779f32602788e126ab6047 100644
index ae96fc27a67c1a28d6385811448597f121169e28..f8455c8543176b38b1573a09852d51657c60a376 100644
--- a/extensions/browser/sandboxed_unpacker.cc
+++ b/extensions/browser/sandboxed_unpacker.cc
@@ -991,6 +991,7 @@ absl::optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
@@ -995,6 +995,7 @@ absl::optional<base::Value> SandboxedUnpacker::RewriteManifestFile(
DCHECK(!public_key_.empty());
base::Value final_manifest = manifest.Clone();
final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_);
patches/extensions-common-api-_api_features.json.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
index ba741dfdbc766f3301cd279735dd1ff71b723aeb..c387625867a075114259054e6f2eacc27620ad24 100644
index 9c192afdc2d5a9e9ec310e7a401f79a8269722f7..47e52e2c2e53b94f0030eeba2e3eb16a904c89b5 100644
--- a/extensions/common/api/_api_features.json
+++ b/extensions/common/api/_api_features.json
@@ -527,6 +527,7 @@
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 58f85cc839f24bc098612be89b438e759b290034..26c2073973bf14162b7accd64ccefd0a6a072eb0 100644
index d0facd07f004e35c7f4ff7e0b10d07fb79924840..8d0d3103fb0efa770f5ec845e62cc52d2aa068cb 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -274,6 +274,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -277,6 +277,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
if (IsReadingListMessagesEnabled()) {
registry->RegisterBooleanPref(kPrefReadingListMessagesNeverShow, false);
}
patches/net-cookies-canonical_cookie.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
index d3fe5891fa6f67f54a8be9e4dc074111eab3bf28..5f9949b94a4c94e6bb97745fc9d300506dc2cab3 100644
index 9d28383d04f893ac0907c91430ac6d2322ffd8de..ab0efc0e18f495447f1b1f8c3bc0d96c9ad4151f 100644
--- a/net/cookies/canonical_cookie.cc
+++ b/net/cookies/canonical_cookie.cc
@@ -542,6 +542,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
patches/net-dns-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn
index ce3c9cf22594dd0976a33cd61c8394638b87cd62..e075b2d272016b1bed5445dcfe377d6c8f968a45 100644
index 1895dfb66544f8e51f7cce980a76cea4980d4ac0..0dd67f2eab3f57841713959f51b1e14b81f281dd 100644
--- a/net/dns/BUILD.gn
+++ b/net/dns/BUILD.gn
@@ -23,6 +23,7 @@ source_set("dns") {
@@ -10,7 +10,7 @@ index ce3c9cf22594dd0976a33cd61c8394638b87cd62..e075b2d272016b1bed5445dcfe377d6c
public = []
sources = [
@@ -208,6 +209,7 @@ source_set("host_resolver") {
@@ -209,6 +210,7 @@ source_set("host_resolver") {
"//net/*",
"//services/network/*",
]
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 291994d832b732aca74086b2831a91f34923ed2e..5a161d33e633e09c415a4bbc6b732a100b32fc73 100644
index e90fb519db76e42891301d1ca2ad1e3cbf300e68..61d06fefb6f2ffedca3a9a6cea3725dffdbdd29b 100644
--- a/net/dns/host_cache.cc
+++ b/net/dns/host_cache.cc
@@ -261,6 +261,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
@@ -262,6 +262,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
}
copy.set_hostnames(std::move(hostnames_with_port));
}
patches/net-http-transport_security_state.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 8488019ec5f071d474217fe796d8688bab48acd1..f453bc682a40e11424c96c1e170b9c79f632b088 100644
index 2e9761fb6216f588903785c9d60ac26817e4307a..fcded3f89785e4cd68530d689db9f8b39a047d9e 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -414,6 +414,7 @@ TransportSecurityState::TransportSecurityState(
patches/services-network-public-cpp-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn
index 772d4ba59955713af29d4c61e6ad5f95a01cc353..f2a95ac743094adbecaf14b0e42daf3df587e524 100644
index 11d4acd5c1aeab6cc6e11d881794ffe3c364d847..9911b3ebf0e91d846ecafe0eebd6f5b7c68d19a2 100644
--- a/services/network/public/cpp/BUILD.gn
+++ b/services/network/public/cpp/BUILD.gn
@@ -162,6 +162,7 @@ component("cpp") {
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 94a8adc1203d2f2222ad399dc789090b09039445..2ca62c480ab8b3b3e3747c6970498977e8f1b31a 100644
index be695e387ee0ba2e40c7b980f80eb6c14c819826..8e4fbb440739f2eb5027d3dcdf5f45f28a6fcc22 100644
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -2466,6 +2466,7 @@ generated_interface_sources_in_modules = [
@@ -2462,6 +2462,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 7f7c8f9f671ada70c29fa3f7d302d1ffac73ac38..83cbf7a543b677295d9284f07a45df75140e9325 100644
index 24583a25bb36c00a086bbb147313624a7a080d60..076bb0bb3dcb9b948824745a8d3036bc3e0968c0 100644
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -1140,6 +1140,7 @@ static_idl_files_in_modules = get_path_info(
@@ -1139,6 +1139,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-modules-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
index 9681a03c30934e6289fb383ff620847f87dbb5b3..3b3bb24742f9145032dfe9b1a9ab93118398caa5 100644
index b733a8cfd70408f8593e612aaf7caf37173641f9..261f50012154c5630a93839d49f80936b2360378 100644
--- a/third_party/blink/renderer/modules/BUILD.gn
+++ b/third_party/blink/renderer/modules/BUILD.gn
@@ -15,6 +15,7 @@ if (is_android) {
patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
index 67aab9432c8681b37a4f0a7ca5f5e871498f9c43..699cf7b5b7552a041f00f1e058b5a3481d3c615a 100644
index d33ffcf8609e6113c130ccc469f28f24e58fec95..131c8c5b5cc2ab236b3a6f5e403c14ecfb23178b 100644
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -1974,6 +1974,7 @@ ImageData* BaseRenderingContext2D::getImageData(
@@ -2005,6 +2005,7 @@ ImageData* BaseRenderingContext2D::getImageData(
}
ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -10,7 +10,7 @@ index 67aab9432c8681b37a4f0a7ca5f5e871498f9c43..699cf7b5b7552a041f00f1e058b5a348
int sx,
int sy,
int sw,
@@ -2091,6 +2092,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -2122,6 +2123,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
}
patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
index 2b58c2c93f66d517ab9be4c5ad9cbeac0f182e42..7efbe1de0061abe25203e89f2107618108d92fd8 100644
index aa248fa99914c9d76932f55c25d24d17c6d0e847..692e656c4db1bc425c99f5f966902ea660674196 100644
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -938,6 +938,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
@@ -951,6 +951,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
if (!canvas()->GetDocument().GetFrame())
return MakeGarbageCollected<TextMetrics>();
patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
index f249a349889ef66af4e4c4fd141b658ed82fe682..62cd029698221452b20584b31009456ed8c5437d 100644
index 7d35321082a92385137b81f340a90aba122a3505..9d1d48c71c0437f25beee0a464dab24df4f2104d 100644
--- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -481,6 +481,8 @@ void MediaDevices::DevicesEnumerated(
@@ -482,6 +482,8 @@ void MediaDevices::DevicesEnumerated(
}
}
patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
index d706480b2ce4c7d3da4c22784da9d040df0dfe20..e09dd620026bd695669e93b059cc9e69d5f6baf0 100644
index 3bff600fbfcda016ea8b5fa3421f1f1bb642c4af..fbe5a880fd11276518ab8faee268b10a6f6eb158 100644
--- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
@@ -5250,6 +5250,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
index 025e5189b0388eeb83fee6772a4df705c3017b02..2f39652f72efec937b763b66d6d75241ae8ecdfb 100644
index 8d94d13113625b843637661abb2c537534c3e977..9ea46710a6ddde32193b018235e34e2c32c66afe 100644
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -2935,6 +2935,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
patches/tools-gritsettings-resource_ids.spec.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 1aa8d3ce7d40feeb18e6dcc197135e26cac76513..d7e93f367ceb5bf379fccb935b6ebb92286e9984 100644
index 9ac1ce5f2db159808fc3a5cf824df90a572f9b3d..25443c248ff91d810b8701e629ae6ff87dfea6ba 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -47,6 +47,9 @@
@@ -12,7 +12,7 @@ index 1aa8d3ce7d40feeb18e6dcc197135e26cac76513..d7e93f367ceb5bf379fccb935b6ebb92
"chrome/app/google_chrome_strings.grd": {
"messages": [400],
},
@@ -511,6 +514,9 @@
@@ -523,6 +526,9 @@
"META": {"align": 100},
"messages": [2700],
},
patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
index 3a83832b6da8ab39ef203f19042d92ff8bd2ef66..16fce48882d6254bd0686c2ce0f7eba7f5574690 100644
index 9eb6576e95bb2bb663b467cb596f4471de1dfe6b..beb66a1c91cb26158d53f50460a79feffd79e14c 100644
--- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
@@ -13426,6 +13426,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
@@ -13328,6 +13328,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
patches/ui-views-controls-button-md_text_button.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc
index 486690b1833da7dfae73ca1f55edf5ab0e6a7c36..c2b3721196b1fba7ab193979f6fc9f1919b6362e 100644
index 7e42f93386e5cea6dca0a60f5005ff3d3f7298fb..ee0decd9fa572e058029f09f304d53500d6f0a57 100644
--- a/ui/views/controls/button/md_text_button.cc
+++ b/ui/views/controls/button/md_text_button.cc
@@ -248,6 +248,7 @@ void MdTextButton::UpdateColors() {
@@ -250,6 +250,7 @@ void MdTextButton::UpdateColors() {
UpdateTextColor();
UpdateBackgroundColor();
SchedulePaint();