From ab04f9026151bd9b28df5388e83c6ce85efc6938 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 11 Mar 2021 07:54:18 +0100 Subject: [PATCH 001/141] Conflict-resolved patches from Chromium 90.0.4430.93 to Chromium 91.0.4449.6. --- patches/chrome-VERSION.patch | 8 ++--- ...ome-android-java-AndroidManifest.xml.patch | 22 ++++++------ ...-browser-toolbar-ToolbarManager.java.patch | 19 +++++------ ...wser-resources-extensions-toolbar.js.patch | 2 +- ...ettings-people_page-sync_controls.js.patch | 16 ++++----- ...cy_page-personalization_options.html.patch | 32 +++++++---------- ...y_page-privacy_page_browser_proxy.js.patch | 34 +++++++++---------- ...me-browser-ui-tabs-tab_strip_model.h.patch | 8 ++--- ...toolbar-recent_tabs_sub_menu_model.h.patch | 4 +-- ...tensions-chrome_extensions_client.cc.patch | 6 ++-- patches/components-permissions-BUILD.gn.patch | 4 +-- .../content-browser-browser_main_loop.h.patch | 12 +++---- ...er-modules-webaudio-analyser_node.cc.patch | 10 +++--- 13 files changed, 85 insertions(+), 92 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index eab6a7f3188..a26bf305130 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index b4c1ed25b7c57d3a4445fcab71f4e1b4d8eb5683..6dfb1b68b5f275d91489ff30a3dd042e0d63fdd6 100644 +index 5635f5a5d60d57982a095962b9cbe738fc7e019e..a08d4b786b14481cbb1aca1e7da4dfbee45f5f11 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=90 + MAJOR=91 -MINOR=0 --BUILD=4430 --PATCH=93 +-BUILD=4449 +-PATCH=6 +MINOR=1 +BUILD=26 +PATCH=8 diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index b9ffc77a4c0..05bf00b0de2 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 9d44cc4f4f998dfe32e4933de20029584924877d..3224ec0f125b0a508cf7687329884bc407d1af3e 100644 +index 19323693b5fd866b6e35520a4a0c1f2775bffe36..89167333a6264e87e932986768a896b70a734a94 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -39,7 +39,9 @@ by a child template that "extends" this file. +@@ -38,7 +38,9 @@ by a child template that "extends" this file. {% endif %} @@ -12,7 +12,7 @@ index 9d44cc4f4f998dfe32e4933de20029584924877d..3224ec0f125b0a508cf7687329884bc4 -@@ -47,9 +49,13 @@ by a child template that "extends" this file. +@@ -46,9 +48,13 @@ by a child template that "extends" this file. @@ -26,7 +26,7 @@ index 9d44cc4f4f998dfe32e4933de20029584924877d..3224ec0f125b0a508cf7687329884bc4 -@@ -58,7 +64,9 @@ by a child template that "extends" this file. +@@ -57,7 +63,9 @@ by a child template that "extends" this file. @@ -36,7 +36,7 @@ index 9d44cc4f4f998dfe32e4933de20029584924877d..3224ec0f125b0a508cf7687329884bc4 -@@ -106,7 +114,9 @@ by a child template that "extends" this file. +@@ -103,7 +111,9 @@ by a child template that "extends" this file. @@ -46,15 +46,15 @@ index 9d44cc4f4f998dfe32e4933de20029584924877d..3224ec0f125b0a508cf7687329884bc4 {% block extra_uses_permissions %} {% endblock %} -@@ -159,6 +169,7 @@ by a child template that "extends" this file. - org.chromium.chrome.browser.ChromeApplication - {%- endif -%} - {% endblock %}" +@@ -150,6 +160,7 @@ by a child template that "extends" this file. + + {% endif %} @@ -62,7 +62,7 @@ index 9d44cc4f4f998dfe32e4933de20029584924877d..3224ec0f125b0a508cf7687329884bc4 {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1203,6 +1215,7 @@ by a child template that "extends" this file. +@@ -1205,6 +1217,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index e6d48bdabe5..33b0215e2aa 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,27 +1,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -index 6fbf96c32c9dde96b8223e3111ac2670a1327b63..dcfce5aff3a4e1261e0e62e309ef170d62cd135c 100644 +index 4eb955bd30dd8b91b21ebdad560c2020a8a842f5..47b62a21926ace08f43ff870a6cebe52c8e5dbb5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -453,14 +453,14 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve - ThemeColorProvider overviewModeThemeColorProvider = mAppThemeColorProvider; - - Runnable requestFocusRunnable = compositorViewHolder::requestFocus; +@@ -451,13 +451,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve + boolean isCustomTab = toolbarLayout instanceof CustomTabToolbar; + ThemeColorProvider menuButtonThemeColorProvider = + isCustomTab ? mCustomTabThemeColorProvider : browsingModeThemeColorProvider; - mMenuButtonCoordinator = new MenuButtonCoordinator(appMenuCoordinatorSupplier, + mMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator(appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, (focus, type) -> setUrlBarFocus(focus, type), requestFocusRunnable, shouldShowUpdateBadge, isInOverviewModeSupplier, - isCustomTab ? mCustomTabThemeColorProvider : browsingModeThemeColorProvider, - R.id.menu_button_wrapper); + menuButtonThemeColorProvider, R.id.menu_button_wrapper); - MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new MenuButtonCoordinator( + MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator( appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, (focus, type) -> setUrlBarFocus(focus, type), -@@ -897,7 +897,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve - boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, - boolean isTabGroupsAndroidContinuationEnabled) { +@@ -870,7 +870,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve + OneshotSupplier startSurfaceSupplier, boolean isGridTabSwitcherEnabled, + boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled) { // clang-format off - TopToolbarCoordinator toolbar = new TopToolbarCoordinator(controlContainer, toolbarLayout, + TopToolbarCoordinator toolbar = new org.chromium.chrome.browser.toolbar.top.BraveTopToolbarCoordinator(controlContainer, toolbarLayout, diff --git a/patches/chrome-browser-resources-extensions-toolbar.js.patch b/patches/chrome-browser-resources-extensions-toolbar.js.patch index 8e11f4d8ec0..6a5c514b9bd 100644 --- a/patches/chrome-browser-resources-extensions-toolbar.js.patch +++ b/patches/chrome-browser-resources-extensions-toolbar.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/toolbar.js b/chrome/browser/resources/extensions/toolbar.js -index 25a38b7082bb22450aff1560843ef8c67e9bd405..00647f14600d61b39f4f329b865cb80d2568648d 100644 +index e94afd0280a7fe1fc33e36109a707d2791ebfa58..c56ef089788e2ad05df46a72182220bb05b284e8 100644 --- a/chrome/browser/resources/extensions/toolbar.js +++ b/chrome/browser/resources/extensions/toolbar.js @@ -4,7 +4,7 @@ diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch index 462f1e99017..2db0fe5b98a 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch @@ -1,17 +1,17 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.js b/chrome/browser/resources/settings/people_page/sync_controls.js -index 663f8cda6cdcddd7b87e15f713ad3352f52d9629..3a0546e50532fda99bd248c3fc3873eeee8f3b94 100644 +index 37932cbc8c8d3962706a8ce436117d736440492f..a232e52bb4c74792f0dcc7ef646c6a536992af1e 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.js +++ b/chrome/browser/resources/settings/people_page/sync_controls.js -@@ -89,7 +89,7 @@ Polymer({ - 'sync-prefs-changed', this.handleSyncPrefsChanged_.bind(this)); - - const router = settings.Router.getInstance(); -- if (router.getCurrentRoute() === router.getRoutes().SYNC_ADVANCED) { -+ if (router.getCurrentRoute() === router.getRoutes().BRAVE_SYNC_SETUP) { +@@ -108,7 +108,7 @@ Polymer({ + const router = Router.getInstance(); + if (router.getCurrentRoute() === + /** @type {{ SYNC_ADVANCED: !Route }} */ +- (router.getRoutes()).SYNC_ADVANCED) { ++ (router.getRoutes()).BRAVE_SYNC_SETUP) { this.browserProxy_.didNavigateToSyncPage(); } }, -@@ -216,6 +216,7 @@ Polymer({ +@@ -241,6 +241,7 @@ Polymer({ * @private */ syncControlsHidden_() { diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch index fc5a5a1edb9..65a71ce0f56 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch @@ -1,16 +1,13 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html -index 350712a350e79ec135fbcdfbbe57b4de233e07ef..8a0d6176386a61ca5bce8be86042098392b387fa 100644 +index 5267611e872b3967910c834c3ace4dab4634fdb9..8ceeab15c2b39f9e90cdd877164d0b28ed41c2d2 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html -@@ -16,6 +16,7 @@ - - - +@@ -1,3 +1,4 @@ + - - @@ -26,7 +23,7 @@ index 350712a350e79ec135fbcdfbbe57b4de233e07ef..8a0d6176386a61ca5bce8be860420983 @@ -34,7 +31,7 @@ index 350712a350e79ec135fbcdfbbe57b4de233e07ef..8a0d6176386a61ca5bce8be860420983 @@ -43,7 +40,7 @@ index 350712a350e79ec135fbcdfbbe57b4de233e07ef..8a0d6176386a61ca5bce8be860420983 @@ -60,7 +57,7 @@ index 350712a350e79ec135fbcdfbbe57b4de233e07ef..8a0d6176386a61ca5bce8be860420983 @@ -68,11 +65,8 @@ index 350712a350e79ec135fbcdfbbe57b4de233e07ef..8a0d6176386a61ca5bce8be860420983 - ++ diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch index 71c4a8c0f18..1795d888a13 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.js.patch @@ -1,22 +1,22 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js -index a839289280f3947fb5ac754de1cc0c245e55872c..cfd9430e6711b8b635a1659618af079f90d8524e 100644 +index 5675d8df7f1ce21d1fd429fc4da8ce8cdfdd0d33..fd33e82db3a6548189fab4b1344d9a89efebd73b 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js -@@ -48,7 +48,7 @@ cr.define('settings', function() { +@@ -47,7 +47,7 @@ export let SecureDnsSetting; - /** @interface */ - /* #export */ class PrivacyPageBrowserProxy { -- // -+ // - /** @return {!Promise} */ - getMetricsReporting() {} + /** @interface */ + export class PrivacyPageBrowserProxy { +- // ++ // + /** @return {!Promise} */ + getMetricsReporting() {} -@@ -99,7 +99,7 @@ cr.define('settings', function() { - * @implements {settings.PrivacyPageBrowserProxy} - */ - /* #export */ class PrivacyPageBrowserProxyImpl { -- // -+ // - /** @override */ - getMetricsReporting() { - return cr.sendWithPromise('getMetricsReporting'); +@@ -98,7 +98,7 @@ export class PrivacyPageBrowserProxy { + * @implements {PrivacyPageBrowserProxy} + */ + export class PrivacyPageBrowserProxyImpl { +- // ++ // + /** @override */ + getMetricsReporting() { + return sendWithPromise('getMetricsReporting'); diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index 500a4bc12ad..712598359f5 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index c61701b6204e47fabdc92dcf9719c5d682617b62..6c44c633bb30a3831d1f054b407f342fb68159fc 100644 +index 3efee4084a45299fd94188f8f8c6ae5c37644a09..26541ddbb53d71aca48854cecab016b3bc79572c 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -581,6 +581,7 @@ class TabStripModel : public TabGroupController { - // current tree of openers). - bool ShouldResetOpenerOnActiveTabChange(content::WebContents* contents) const; +@@ -585,6 +585,7 @@ class TabStripModel : public TabGroupController { + // Serialise this object into a trace. + void WriteIntoTracedValue(perfetto::TracedValue context) const; + TAB_STRIP_MODEL_H_ private: diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch index 3ea9fa8dce4..2303ee2b7fd 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch @@ -1,11 +1,11 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h -index 4a9e55b4c8dc5f495058c6a6bdc4a0f9a20b88c5..ef4f8582761716ccfa1bba5d13435d5a57961653 100644 +index 340ff91a05d7c578aa247ce68dd00c114c252f6b..c0b4b25863dc8a927a29fd73340497e042e53365 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h @@ -75,6 +75,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel, bool GetURLAndTitleForItemAtIndex(int index, std::string* url, - base::string16* title); + std::u16string* title); + BRAVE_RECENT_TABS_SUB_MENU_MODEL_H_ private: diff --git a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch index fc0182b9232..e27559a3dca 100644 --- a/patches/chrome-common-extensions-chrome_extensions_client.cc.patch +++ b/patches/chrome-common-extensions-chrome_extensions_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc -index 8e0a06316edc946b6c2aa36294ecf5ae42f4f9dd..b9630df74c4d30b403fd5443db902c0342df0e10 100644 +index e0651bc60d9bbb52810c8ca1ab13398d7390ba80..1d0de5f66c2d6842bd9378f037fb569a1c46e33e 100644 --- a/chrome/common/extensions/chrome_extensions_client.cc +++ b/chrome/common/extensions/chrome_extensions_client.cc @@ -13,6 +13,7 @@ @@ -7,10 +7,10 @@ index 8e0a06316edc946b6c2aa36294ecf5ae42f4f9dd..b9630df74c4d30b403fd5443db902c03 #include "base/strings/string_util.h" #include "base/values.h" +#include "brave/common/extensions/brave_extensions_api_provider.h" + #include "chrome/common/chrome_resource_request_blocked_reason.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/chrome_extensions_api_provider.h" - #include "chrome/common/extensions/manifest_handlers/theme_handler.h" -@@ -55,6 +56,7 @@ const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh"; +@@ -56,6 +57,7 @@ const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh"; ChromeExtensionsClient::ChromeExtensionsClient() { AddAPIProvider(std::make_unique()); AddAPIProvider(std::make_unique()); diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 57af5240800..73d1e264fe8 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 799755985b575a7464897d0969bf383c386d267c..84620efdf6cfc864cc6942272965b42382685c61 100644 +index 2faa3caadfea14878ec7a833fb61a4499a0bd556..07d6897832f4d45858c3793653c71b69387f2b12 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn -@@ -89,6 +89,7 @@ source_set("permissions") { +@@ -98,6 +98,7 @@ source_set("permissions") { "//ui/base", "//url", ] diff --git a/patches/content-browser-browser_main_loop.h.patch b/patches/content-browser-browser_main_loop.h.patch index 93f31c985cf..1f519764ae3 100644 --- a/patches/content-browser-browser_main_loop.h.patch +++ b/patches/content-browser-browser_main_loop.h.patch @@ -1,12 +1,12 @@ diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h -index fcb630599074868be09fdb58c174dd93c0e569ad..bea3bdca948ad293205223e38e99edfb6c710663 100644 +index ca3a245926ac8aed58bbaf567910641bbd970955..24fba13e07dccc1dd524fe62d08c0bdf1c12a87d 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h -@@ -143,6 +143,7 @@ class CONTENT_EXPORT BrowserMainLoop { - void PreMainMessageLoopStart(); - void MainMessageLoopStart(); - void PostMainMessageLoopStart(); +@@ -159,6 +159,7 @@ class CONTENT_EXPORT BrowserMainLoop { + void RunMainMessageLoop(); + + // Performs the pre-shutdown steps. + virtual void PreShutdown(); - // Create and start running the tasks we need to complete startup. Note that + // Performs the shutdown sequence, starting with PostMainMessageLoopRun diff --git a/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch index 1f137768ad4..89a857ae10f 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch @@ -1,11 +1,11 @@ diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.cc b/third_party/blink/renderer/modules/webaudio/analyser_node.cc -index 53528e0538baea73f8afce6ec8d14344b741b642..3f2a175e69f0a3dbb8ad717c71e26cd5a5a93baf 100644 +index 5359becd83e4d958f7c77e0ad79979211b4ba00f..ce5648ea0bfdc40b25524ab0482c209972cca039 100644 --- a/third_party/blink/renderer/modules/webaudio/analyser_node.cc +++ b/third_party/blink/renderer/modules/webaudio/analyser_node.cc -@@ -35,6 +35,7 @@ namespace blink { - - AnalyserHandler::AnalyserHandler(AudioNode& node, float sample_rate) - : AudioBasicInspectorHandler(kNodeTypeAnalyser, node, sample_rate) { +@@ -37,6 +37,7 @@ AnalyserHandler::AnalyserHandler(AudioNode& node, float sample_rate) + : AudioBasicInspectorHandler(kNodeTypeAnalyser, node, sample_rate), + analyser_( + node.context()->GetDeferredTaskHandler().RenderQuantumFrames()) { + BRAVE_ANALYSERHANDLER_CONSTRUCTOR channel_count_ = 2; AddOutput(1); From 79f8747581d75c86aa6bdf107ea6eab44587b3cc Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 18 Mar 2021 11:11:37 +0100 Subject: [PATCH 002/141] Updated patches from Chromium 90.0.4430.93 to Chromium 91.0.4449.6. --- patches/base-BUILD.gn.patch | 4 +- ...base-threading-thread_restrictions.h.patch | 4 +- patches/build-config-BUILDCONFIG.gn.patch | 4 +- patches/build-config-android-BUILD.gn.patch | 6 +-- patches/build-config-android-config.gni.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 4 +- patches/build-config-android-rules.gni.patch | 6 +-- patches/build-config-compiler-BUILD.gn.patch | 4 +- ...build-util-android_chrome_version.py.patch | 2 +- patches/chrome-BUILD.gn.patch | 29 ++++++------ patches/chrome-android-BUILD.gn.patch | 28 +++++------ ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 6 +-- ...d-expectations-lint-suppressions.xml.patch | 4 +- ...ome-android-features-tab_ui-BUILD.gn.patch | 2 +- ...a-res-layout-custom_tabs_toolbar.xml.patch | 4 +- ...rome-browser-app-ChromeActivity.java.patch | 4 +- ...r-native_page-NativePageFactory.java.patch | 4 +- ...ions-NotificationPlatformBridge.java.patch | 4 +- ...me-browser-ntp-NewTabPageLayout.java.patch | 4 +- ...ync-settings-ManageSyncSettings.java.patch | 6 +-- ...-browser-toolbar-ToolbarManager.java.patch | 6 +-- patches/chrome-app-BUILD.gn.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 6 +-- ...wser-chrome_content_browser_client.h.patch | 4 +- ...wser-devtools-devtools_ui_bindings.h.patch | 4 +- ...owser-download-download_item_model.h.patch | 4 +- .../chrome-browser-extensions-BUILD.gn.patch | 4 +- ...r-extensions-extension_management.cc.patch | 2 +- ...owser-extensions-extension_service.h.patch | 4 +- ...flags-android-chrome_feature_list.cc.patch | 4 +- ...r-external_process_importer_client.h.patch | 4 +- ...porter-in_process_importer_bridge.cc.patch | 2 +- ...mporter-in_process_importer_bridge.h.patch | 4 +- ...et-system_network_context_manager.cc.patch | 2 +- ...notification_display_service_impl.cc.patch | 4 +- ...-notification_platform_bridge_mac.mm.patch | 4 +- ...ication_platform_bridge_mac_utils.mm.patch | 4 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +-- .../chrome-browser-profiles-profile.cc.patch | 6 +-- ...profiles-profile_avatar_icon_util.cc.patch | 2 +- ...ome-browser-profiles-profile_impl.cc.patch | 4 +- ...e-browser-profiles-profile_manager.h.patch | 2 +- ...iles-profile_shortcut_manager_win.cc.patch | 4 +- ...browser-profiles-renderer_updater.cc.patch | 2 +- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...text_menu-render_view_context_menu.h.patch | 4 +- ...er-resources-history-history_item.js.patch | 2 +- ...resources-history-history_toolbar.js.patch | 4 +- ...-browser-resources-settings-BUILD.gn.patch | 6 +-- ...es-settings-about_page-about_page.js.patch | 2 +- ...s-settings-lifetime_browser_proxy.js.patch | 6 +-- ...vacy_page-personalization_options.js.patch | 16 +++---- ...tings-privacy_page-privacy_page.html.patch | 6 +-- ...ettings-privacy_page-privacy_page.js.patch | 8 ++-- ...-browser-resources-settings-route.js.patch | 2 +- ...owser-resources-settings-settings.js.patch | 2 +- ...-settings-settings_ui-settings_ui.js.patch | 2 +- ...settings-category_default_setting.js.patch | 2 +- ...low-local_profile_customization.html.patch | 4 +- ...e_picker-profile_picker_main_view.js.patch | 2 +- ...r-resources-tools-optimize_webui.gni.patch | 4 +- ...e-browser-shell_integration_linux.cc.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +-- ...rome-browser-ui-appmenu-AppMenu.java.patch | 4 +- patches/chrome-browser-ui-browser.cc.patch | 6 +-- patches/chrome-browser-ui-browser.h.patch | 4 +- ...rome-browser-ui-browser_navigator.cc.patch | 4 +- .../chrome-browser-ui-chrome_pages.cc.patch | 2 +- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 2 +- ...-extension_action_view_controller.cc.patch | 4 +- ...s-extension_action_view_controller.h.patch | 2 +- ...ions-icon_with_badge_image_source.cc.patch | 2 +- ...rtup-startup_browser_creator_impl.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- .../chrome-browser-ui-tabs-tab_style.cc.patch | 2 +- ...chrome_location_bar_model_delegate.h.patch | 2 +- ...oolbar-recent_tabs_sub_menu_model.cc.patch | 2 +- ...cent_tabs_sub_menu_model_unittest.cc.patch | 4 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 4 +- ...ws-bookmarks-bookmark_bubble_view.cc.patch | 2 +- ...-views-download-download_item_view.h.patch | 2 +- ...-views-extensions-extension_popup.cc.patch | 4 +- ...rowser-ui-views-frame-browser_view.h.patch | 4 +- ...ws-location_bar-location_bar_view.cc.patch | 2 +- ...ews-location_bar-location_bar_view.h.patch | 2 +- ...s-location_bar-location_icon_view.cc.patch | 2 +- ...ble-permission_prompt_bubble_view.cc.patch | 4 +- ...ews-profiles-avatar_toolbar_button.h.patch | 2 +- ...views-profiles-incognito_menu_view.h.patch | 4 +- ...i-views-profiles-profile_menu_view.h.patch | 2 +- ...ws-profiles-profile_menu_view_base.h.patch | 2 +- ...ws-tabs-tab_hover_card_bubble_view.h.patch | 8 ++-- ...ser-ui-views-tabs-tab_style_views.cc.patch | 2 +- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +- ...wser-ui-views-toolbar-toolbar_view.h.patch | 12 ++--- ...s-translate-translate_bubble_view.cc.patch | 2 +- ...ws-translate-translate_bubble_view.h.patch | 4 +- ...r-ui-webui-bookmarks-bookmarks_ui.cc.patch | 4 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +- ...ebui-settings-import_data_handler.cc.patch | 6 +-- ...-ui-webui-settings-people_handler.cc.patch | 2 +- ...ttings_localized_strings_provider.cc.patch | 4 +- ...bui-settings-site_settings_helper.cc.patch | 8 ++-- ...ome-browser-ui-webui-theme_source.cc.patch | 2 +- ...s-components-web_app_shortcut_mac.mm.patch | 2 +- ...me_authenticator_request_delegate.cc.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 6 +-- ...ommon-importer-importer_data_types.h.patch | 6 +-- ...mmon-importer-mock_importer_bridge.h.patch | 4 +- patches/chrome-installer-mac-BUILD.gn.patch | 4 +- ...taller-mac-signing-config_factory.py.patch | 4 +- ...hrome-installer-mac-signing-parts.py.patch | 6 +-- .../chrome-installer-util-shell_util.cc.patch | 2 +- patches/chrome-renderer-BUILD.gn.patch | 4 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- ...rer-chrome_content_renderer_client.h.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 6 +-- ...-build-mac-infoplist_strings_util.cc.patch | 2 +- ...r-external_process_importer_bridge.h.patch | 4 +- patches/chrome-utility-services.cc.patch | 2 +- ...s-bookmarks-browser-bookmark_model.h.patch | 4 +- ...t-android-java-res-values-dimens.xml.patch | 2 +- ..._updater-component_updater_service.h.patch | 2 +- ...ings-core-common-content_settings.cc.patch | 2 +- ...core-common-content_settings_types.h.patch | 4 +- ...ts-external_intents-android-BUILD.gn.patch | 2 +- ...history-core-browser-history_types.h.patch | 4 +- ...nts-infobars-core-infobar_delegate.h.patch | 6 +-- ...x-browser-autocomplete_controller.cc.patch | 2 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 4 +- .../components-os_crypt-os_crypt_win.cc.patch | 2 +- .../components-page_info-page_info.cc.patch | 4 +- ...components-page_info-page_info_ui.cc.patch | 2 +- ...nager-core-browser-login_database.cc.patch | 2 +- ...ore-browser-password_form_filling.cc.patch | 4 +- patches/components-strings-BUILD.gn.patch | 4 +- patches/components-sync-driver-BUILD.gn.patch | 6 +-- ...s-sync-driver-profile_sync_service.h.patch | 4 +- patches/components-sync-engine-BUILD.gn.patch | 2 +- ...ents-sync-engine-model_type_worker.h.patch | 4 +- ...nents-sync-protocol-proto_visitors.h.patch | 6 +-- ...s-update_client-updater_state_win.cc.patch | 4 +- ...-browser-browser_main_runner_impl.cc.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 6 +-- ...content-browser-webui-web_ui_impl.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 2 +- ...-public-browser-browser_main_parts.h.patch | 8 ++-- ...lic-browser-content_browser_client.h.patch | 4 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- ...r-api-web_request-web_request_api.cc.patch | 4 +- ...nsions-browser-sandboxed_unpacker.cc.patch | 2 +- ...nsions-browser-user_script_manager.h.patch | 2 +- ...nsions-common-api-_api_features.json.patch | 4 +- patches/net-BUILD.gn.patch | 4 +- patches/net-cookies-canonical_cookie.cc.patch | 4 +- patches/net-dns-dns_transaction.cc.patch | 4 +- .../sandbox-policy-win-sandbox_win.cc.patch | 4 +- ...services-network-public-cpp-BUILD.gn.patch | 4 +- ...network-restricted_cookie_manager.cc.patch | 6 +-- ...-common-client_hints-client_hints.cc.patch | 2 +- .../third_party-blink-renderer-BUILD.gn.patch | 2 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 6 +-- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...r-core-html-media-autoplay_policy.cc.patch | 2 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 2 +- ...anvas2d-base_rendering_context_2d.cc.patch | 6 +-- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...as2d-canvas_rendering_context_2d.idl.patch | 2 +- ...reen_canvas_rendering_context_2d.idl.patch | 2 +- ...paint-paint_rendering_context_2d.idl.patch | 2 +- ...r_request_media_key_system_access.cc.patch | 2 +- ...modules-mediastream-media_devices.cc.patch | 2 +- ...nderer-modules-modules_idl_files.gni.patch | 2 +- ...odules-webaudio-realtime_analyser.cc.patch | 2 +- ...modules-webaudio-realtime_analyser.h.patch | 2 +- ...ebgl-webgl_rendering_context_base.cc.patch | 46 +++++++++---------- ...tools-gritsettings-resource_ids.spec.patch | 4 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +- ...ity-platform-ax_platform_node_mac.mm.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- patches/ui-native_theme-native_theme.h.patch | 4 +- .../ui-native_theme-native_theme_mac.mm.patch | 4 +- .../ui-native_theme-native_theme_win.cc.patch | 4 +- .../ui-native_theme-native_theme_win.h.patch | 4 +- ...ews-controls-button-md_text_button.h.patch | 4 +- ...es-cr_elements-shared_style_css.html.patch | 2 +- ...ces-cr_elements-shared_vars_css.html.patch | 2 +- 194 files changed, 406 insertions(+), 407 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index ade8b3dae53..d7da4d7e340 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 3138c97d8f4c935e173c49ec7017c949d432083c..60dad5ea4be4c890deae37d5ba70e011c1bcb050 100644 +index 5288a2738d835af7e801ffca94af5e47134c5e10..8b336055f5a23d66bb08e7a4669343785855cbf7 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3888,6 +3888,7 @@ if (is_android) { +@@ -3894,6 +3894,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index a602b55d0db..6b3229633a7 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index ce16488c6d3c377dee372d01c715bd70c8e4a1dc..b8eed94e05d8702a51cfe981cf861a1d189d8273 100644 +index dc5dacc02b67d4f53b4c8348e64846d22e157eb3..96b9f271730dae3c56c23d7e7f4cfd09ee39a2a0 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -452,6 +452,7 @@ INLINE_IF_DCHECK_IS_OFF void DisallowBaseSyncPrimitives() +@@ -453,6 +453,7 @@ INLINE_IF_DCHECK_IS_OFF void DisallowBaseSyncPrimitives() EMPTY_BODY_IF_DCHECK_IS_OFF; class BASE_EXPORT ScopedAllowBaseSyncPrimitives { diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index 4b3e82868af..11e580f8125 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index fa375deef6c851867efdd8e9d6a79261b1256774..5366c53bb34964e452e244b42e8bd29c64d96230 100644 +index 0ef73ab2b2e124466c4ff22fe662273ade82603b..be4efe3977c1354aa2b6636404308dddd617e2dd 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -312,6 +312,7 @@ is_posix = !is_win && !is_fuchsia +@@ -314,6 +314,7 @@ is_posix = !is_win && !is_fuchsia # Holds all configs used for running the compiler. default_compiler_configs = [ diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch index 50acf1807f2..b152064ac9d 100644 --- a/patches/build-config-android-BUILD.gn.patch +++ b/patches/build-config-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn -index 78c7983a71a0d550567e463d0d9d0ad5fa951d93..36c398457409e7ebfbb4e5f857751573b982c442 100644 +index 8cfe7a0c34f0d3000ff3305a2b7930569880865c..0752af7d5ed1d9a3ff42ee17848408bc52e95e4b 100644 --- a/build/config/android/BUILD.gn +++ b/build/config/android/BUILD.gn @@ -50,6 +50,7 @@ config("compiler") { @@ -8,5 +8,5 @@ index 78c7983a71a0d550567e463d0d9d0ad5fa951d93..36c398457409e7ebfbb4e5f857751573 ] + ldflags += ["-Wl,--allow-multiple-definition"] # Resolve conflict between libgcc++ and rustup symbols (e.g. __divdi3) - # $compile_api_level corresponds to the API level used for the sysroot path - # calculation in //build/config/android/config.gni + # TODO(crbug.com/1184398): Move to compiler-rt when we are ready. + ldflags += [ "--rtlib=libgcc" ] diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 11978961ff0..58c976fe4d6 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 0584179abfef1cb215e7a2c93f431d3cb0df8051..6e5b56e2ed6216622c05d16164855afd34a81eff 100644 +index 652ea7429ada84e505478fda0d2dd73d385c88ea..3e9ab86aa360c76727302eae18790b53acb54675 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index f5cbcd3b227..ab01a842380 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 39499e94d3bd428a07fb4676667e93fcea175853..477590f704ba8e6f23eca10be03b816fda96fe9c 100644 +index 0d2a4ba666ce09ab2693993a92f3c2a8247b2f5c..b335570a1c4c006b942ca0e91c62e58221c1d231 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -1921,6 +1921,7 @@ if (enable_java_templates) { +@@ -1923,6 +1923,7 @@ if (enable_java_templates) { _deps = [ ":$_desugar_target" ] _previous_output_jar = _desugar_output_jar } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index cd1c1b28186..95caa6c6b40 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 2b2adf64a06d87b060ee6c6d34ce68185a3fb9c6..4cc7a930f067f2042c60e9148dd100409224f99e 100644 +index 07641a2e09867fd083a1a0c6efdce15d9ddcdff9..6a47fed3c8b3cf46a0f25cf0d78c64b10e62b53a 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -476,6 +476,7 @@ if (enable_java_templates) { +@@ -475,6 +475,7 @@ if (enable_java_templates) { # ] # } template("java_cpp_enum") { @@ -10,7 +10,7 @@ index 2b2adf64a06d87b060ee6c6d34ce68185a3fb9c6..4cc7a930f067f2042c60e9148dd10040 action_with_pydeps(target_name) { forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ]) -@@ -647,6 +648,7 @@ if (enable_java_templates) { +@@ -646,6 +647,7 @@ if (enable_java_templates) { # output = "$target_gen_dir/AndroidManifest.xml" # } template("jinja_template") { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index ebe1f2383db..018c59ca5c9 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 2166af00a6ccc875af3fd47eeb3ffa8e4e337d28..7b70a8cc8678da4648e8ae9aea4e2a7528df868c 100644 +index dd5007a6d7ba773fca0915c3824fdca9d7647aad..9afabef45ea85fb6cb27fbbe4faec808852e6c25 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1711,6 +1711,7 @@ config("chromium_code") { +@@ -1694,6 +1694,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/build-util-android_chrome_version.py.patch b/patches/build-util-android_chrome_version.py.patch index 36c091a5c90..bf841c5e961 100644 --- a/patches/build-util-android_chrome_version.py.patch +++ b/patches/build-util-android_chrome_version.py.patch @@ -1,5 +1,5 @@ diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py -index 91d31e97ad6b5fdc55128a3a5104092323d84c9c..c92067f369c32cfe46cdc6c365661cc19af51a49 100644 +index c06bb38b74b7f8c4e02186d7056ee4a05a2dae04..fcfaecf1f64a198a7a4e6e1e239a4f63e2767f98 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): diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index dd4ab9f224d..a13761928a1 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584da75e2bf2 100644 +index f80853980d0d72fa843f3109593e3c4fadbfb65f..f0756382958921d9d7cae34d9e88f2c04bbb6a11 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -168,6 +168,7 @@ if (!is_android && !is_mac) { +@@ -169,6 +169,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d deps += [ ":chrome_dll", -@@ -437,11 +438,12 @@ if (is_win) { +@@ -438,11 +439,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -459,6 +461,7 @@ if (is_win) { +@@ -460,6 +462,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -525,7 +528,7 @@ if (is_win) { +@@ -526,7 +529,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d "-v", chrome_version_full, "-g", -@@ -594,6 +597,7 @@ if (is_win) { +@@ -600,6 +603,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 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d } } -@@ -626,9 +630,11 @@ if (is_win) { +@@ -632,9 +636,11 @@ if (is_win) { "--scm=0", ] } @@ -61,16 +61,15 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -649,7 +655,7 @@ if (is_win) { +@@ -661,6 +667,7 @@ if (is_win) { + info_plist_target = ":chrome_helper_plist" + } - output_name = chrome_helper_name + invoker.helper_name_suffix - -- info_plist_target = ":chrome_helper_plist" + info_plist_target = ":brave_helper_plist" extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1051,6 +1057,7 @@ if (is_win) { +@@ -1127,6 +1134,7 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -78,7 +77,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1212,6 +1219,7 @@ if (is_win) { +@@ -1288,6 +1296,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -86,7 +85,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1313,12 +1321,13 @@ group("child_dependencies") { +@@ -1389,12 +1398,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -101,7 +100,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..cd60c40ffe63f70e481641938c3b584d output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1372,6 +1381,7 @@ group("resources") { +@@ -1448,6 +1458,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 5782a22e653..fefd6b1b957 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,40 +1,40 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 38c40cd243dcdd7440f8884f2081e0b01bb56da0..8f6f00c3527091f3a8cea2bde61b95789e96aec8 100644 +index b6dd28cf5fcde899f3b1796c4f9168f1103d0f4b..dccd8125a79b8b4d536896d92c83c892bea8dbc3 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -236,6 +236,7 @@ android_resources("chrome_app_java_resources") { +@@ -237,6 +237,7 @@ android_resources("chrome_app_java_resources") { "//third_party/androidx:androidx_preference_preference_java", "//third_party/androidx:androidx_recyclerview_recyclerview_java", ] + deps += brave_chrome_app_java_resources_deps sources += brave_java_resources resource_overlay = true } - + if (enable_vr) { -@@ -552,6 +553,7 @@ android_library("chrome_java") { +@@ -560,6 +561,7 @@ android_library("chrome_java") { ] - + deps += feed_deps + deps += brave_chrome_java_deps - + srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -584,6 +586,7 @@ android_library("chrome_java") { - "//components/ui_metrics:ui_metrics_enums_java", +@@ -590,6 +592,7 @@ android_library("chrome_java") { + "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] + srcjar_deps += brave_chrome_java_srcjar_deps - + # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -713,6 +716,7 @@ group("jni_headers") { - "//chrome/browser/webauthn/android:jni_headers", +@@ -721,6 +724,7 @@ group("jni_headers") { "//components/media_router/browser/android:jni_headers", + "//components/ukm/android:jni_headers", ] + public_deps += ["//brave/build/android:jni_headers"] } - + # TODO(crbug.com/1112471): Get this to run cleanly under Python 3. -@@ -1902,6 +1906,7 @@ if (current_toolchain == default_toolchain) { +@@ -1922,6 +1926,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -42,7 +42,7 @@ index 38c40cd243dcdd7440f8884f2081e0b01bb56da0..8f6f00c3527091f3a8cea2bde61b9578 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2291,6 +2296,7 @@ android_library("base_module_java") { +@@ -2286,6 +2291,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 60a7a014ec2..62bbea3aa1c 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 11f55f86aeb2c7876c7c219200ce5fe8109db14d..70f86c344e78372b8558758eea2bf65ce4a730ae 100644 +index 07010859a51d429cffe2154b8571a8bf38e7deea..2281a5eb5e61eda8f04fa43739dabb4e3371861c 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1465,3 +1465,4 @@ chrome_java_sources = [ +@@ -1449,3 +1449,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index e04e14efe7f..f624c9ecd0b 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 581eff96d34c982dde7a84abd3a928530c12a522..5b5af08f78b2a599f9931bc5f72c3a5b8a453cfa 100644 +index 9153f5f5d9ecfec33cebc12cc018902f73d7fada..9315feebbd32b30180873212f98b56ebe58d7e74 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -170,6 +170,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -168,6 +168,7 @@ template("chrome_public_common_apk_or_module_tmpl") { # Remove unneeded entries from material design values.xml files. resource_values_filter_rules = [ "${_material_package}:[Tt]oolbarLayout" ] @@ -10,7 +10,7 @@ index 581eff96d34c982dde7a84abd3a928530c12a522..5b5af08f78b2a599f9931bc5f72c3a5b if (!_is_monochrome) { product_config_java_packages = [ "org.chromium.chrome.browser" ] -@@ -260,6 +261,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -258,6 +259,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index 6404579f81e..258883df70c 100644 --- a/patches/chrome-android-expectations-lint-suppressions.xml.patch +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml -index efc6c2b4d4002d006f156c1039db783cd426f4b3..1e4b2629da7a2ea415703b901ec7aa91ff6e89d7 100644 +index 5affce0012d65a9f24503b9dd1dff9fab7a5cd66..049fed7c3dfeb2768a55c5ee6b271b97b8751b4a 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -270,4 +270,5 @@ https://chromium.googlesource.com/chromium/src/+/master/build/android/docs/lint. +@@ -276,4 +276,5 @@ https://chromium.googlesource.com/chromium/src/+/master/build/android/docs/lint. diff --git a/patches/chrome-android-features-tab_ui-BUILD.gn.patch b/patches/chrome-android-features-tab_ui-BUILD.gn.patch index 4d753cb250a..6ef7f4346c9 100644 --- a/patches/chrome-android-features-tab_ui-BUILD.gn.patch +++ b/patches/chrome-android-features-tab_ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn -index 0c3a2a878c1e0282a7bf2aab71e523d3a69d5e60..0cc5ea684f0192a5d905ee80d8201b174cf009e2 100644 +index 40275e1f6887d9faedceca23c05538114d5cae3b..bc1afe45c9cbe803e87cff5f311590f2545121ba 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn @@ -189,6 +189,7 @@ android_library("java") { diff --git a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch index 9ff14e08f7f..5b66c07570b 100644 --- a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch +++ b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml -index 83c8fb6f9e42f04379e482cbd46b23c662b4a788..26516c25ed6e3db3fe6d9bf7bd78a37e82dddcdf 100644 +index db579beab66e7f2ab22d53a8273c7df5b611f1a0..af4d2e3c97ae982dce0a1cc90c6dbf4676d303f8 100644 --- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml +++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml -@@ -107,7 +107,7 @@ +@@ -84,7 +84,7 @@ android:gravity="center_vertical" android:orientation="horizontal" /> diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index d987870f927..ae6f8dd738d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -index 4d17e48b5e5e1c04181538633aa18753bf56985c..0e4264ae528060c165f83a0cc068474495806f1f 100644 +index ae463412cedc5b24cf78a3e5b0d06d0ac60183ab..85c572a9288a79ec5410954c41dcc19fc754dc0d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -368,7 +368,7 @@ public abstract class ChromeActivity +@@ -369,7 +369,7 @@ public abstract class ChromeActivity new ArrayList<>(); protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-native_page-NativePageFactory.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-native_page-NativePageFactory.java.patch index 41b44723dfa..3c18b7b03c1 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-native_page-NativePageFactory.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-native_page-NativePageFactory.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java -index d2e7722c732e7b5713e1c16f5c189423342a29ff..66cca43a3571ae23a9a4c22d8fc2514edc1b2fe8 100644 +index fd06887d127cfdbce23fc7d0c7cfdafa3af2bb40..d305d57d3ba3c75176a0d3acc75a83fdbc6c3128 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java -@@ -86,7 +86,7 @@ public class NativePageFactory { +@@ -89,7 +89,7 @@ public class NativePageFactory { NativePageHost nativePageHost = new TabShim(tab, mActivity); if (tab.isIncognito()) return new IncognitoNewTabPage(mActivity, nativePageHost); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch index 34f72498143..21fd102e89e 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java -index 6fa8b0d1833b92dc486b861d2d3a1469d814c574..954c6ac08c4d44a8fcae198788a2b07bd5079736 100644 +index 1394338e3be8c51c40541b37ae5dcaefbc7c7fa9..de474f6a13c3826f55022323ad3a1bc9f5f18b1b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java @@ -81,7 +81,7 @@ public class NotificationPlatformBridge { @@ -29,7 +29,7 @@ index 6fa8b0d1833b92dc486b861d2d3a1469d814c574..954c6ac08c4d44a8fcae198788a2b07b @NotificationType int notificationType, String origin, String scopeUrl, String profileId, boolean incognito, boolean vibrateEnabled, String title, String body, Bitmap image, Bitmap icon, Bitmap badge, int[] vibrationPattern, long timestamp, -@@ -682,7 +682,7 @@ public class NotificationPlatformBridge { +@@ -683,7 +683,7 @@ public class NotificationPlatformBridge { notificationId /* notificationTag */, PLATFORM_ID /* notificationId */)); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch index ae82e97cbd6..35e214d78fb 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -index 24cf07b79d3b2d6fb97fe062999a6611101033a2..0cf8d91289823335d2a823d7f52dd5369a82704a 100644 +index a055408c30bb36c37a9fc46fc1ec8235291fa8f6..715e11e994a6542d39cf817fed64ee0121b56938 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -255,6 +255,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -254,6 +254,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer /* observer = */ this, offlinePageBridge); int maxRows = 2; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 32777a8eb0a..5ba75f09943 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 852faa1e27e0f1dab4b21452435e8c4252746013..deef42dcc6590bfb61e5c3c26ecdd762b19e1d6c 100644 +index d1f6e9cc6b11c060067baff9c6ba5acf7fe9052b..8a37e1696f37d98c245a6adab3b6693cc5e43303 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -@@ -28,7 +28,7 @@ import androidx.appcompat.app.AppCompatActivity; +@@ -27,7 +27,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -11,7 +11,7 @@ index 852faa1e27e0f1dab4b21452435e8c4252746013..deef42dcc6590bfb61e5c3c26ecdd762 import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -377,7 +377,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat +@@ -376,7 +376,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat IdentityServicesProvider.get() .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index 33b0215e2aa..176a9b2072d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -index 4eb955bd30dd8b91b21ebdad560c2020a8a842f5..47b62a21926ace08f43ff870a6cebe52c8e5dbb5 100644 +index 70e532a0e73bd07615a872e25e7b80e54317287d..10236d76fa5ca071768b47d15cd9d45d650426d4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java @@ -451,13 +451,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve @@ -18,12 +18,12 @@ index 4eb955bd30dd8b91b21ebdad560c2020a8a842f5..47b62a21926ace08f43ff870a6cebe52 appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, (focus, type) -> setUrlBarFocus(focus, type), -@@ -870,7 +870,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -879,7 +879,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve OneshotSupplier startSurfaceSupplier, boolean isGridTabSwitcherEnabled, boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled) { // clang-format off - TopToolbarCoordinator toolbar = new TopToolbarCoordinator(controlContainer, toolbarLayout, + TopToolbarCoordinator toolbar = new org.chromium.chrome.browser.toolbar.top.BraveTopToolbarCoordinator(controlContainer, toolbarLayout, mLocationBarModel, mToolbarTabController, - new UserEducationHelper(mActivity, mHandler, TrackerFactory::getTrackerForProfile), + new UserEducationHelper(mActivity, mHandler), buttonDataProviders, mLayoutStateProviderSupplier, browsingModeThemeColorProvider, diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 8e39a4570b5..16f1d488304 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index 19a8c138c42ecd85db409978a27d0adb54de093a..f1b54f34e1eb376565d700ce90f59c3c9c54c179 100644 +index 2df7e6cc9478e35222929f7781d662ca268eaaf5..1837566c414d9887cd4cb673e3b0587bd8f3ecea 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -75,6 +75,8 @@ grit("generated_resources") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 035074c996e..9b7409438cd 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 60acfefd43e4a8a74ae45f86fcef13b56b286e8e..20f3dc3b6c81ced082d15ab971569e18e5bb975c 100644 +index 37546a17ce8f3c114105b117d325c3493c3ae3e9..ab2f2b0b07ccb6c75c5c254283ecee9d1addba0f 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2501,6 +2501,7 @@ static_library("browser") { +@@ -2466,6 +2466,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 59e886855b7..b6ee3040e6d 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 1281ce53672f412451440eb29194acd1ed695ed4..0a3d50b6d6618691f6142e58f01bbc99d9df33c8 100644 +index 3299fbbce872c239f16514bcd0c031b070769488..a7185ef24cc99d29e585f6f354e1e91b4e54ee14 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -307,14 +307,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -308,14 +308,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index 1281ce53672f412451440eb29194acd1ed695ed4..0a3d50b6d6618691f6142e58f01bbc99 const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7285,6 +7285,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7278,6 +7278,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). diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index 9aef155a07c..b2bfd5efec3 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 792e69483a893ae28e45edf74a354f2c070cfc98..6e07b680b73b784322df04ed6a3c0b0199417ad8 100644 +index ec8c8de2754a31dc4d9c1ec5bdd9a192fc45f6ae..a12d182e207b3c12d26be40456318183917a1cd0 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -760,6 +760,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -724,6 +724,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch index 93c17650dfd..50e28cdf8d0 100644 --- a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch +++ b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h -index a4987fd55d676d3e8a1914bfb1acd041efbd6bc6..ff8ef6b5f0cc7836e24d0773f24a0d2fae7abd51 100644 +index a6213ab97923a44c1ee9aaa1025e2e40cad6b1e1..7dd84f058abef355341e820a353784b478c649dc 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.h +++ b/chrome/browser/devtools/devtools_ui_bindings.h -@@ -93,6 +93,9 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate, +@@ -92,6 +92,9 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate, bool IsAttachedTo(content::DevToolsAgentHost* agent_host); private: diff --git a/patches/chrome-browser-download-download_item_model.h.patch b/patches/chrome-browser-download-download_item_model.h.patch index 151790b6d88..b8c630a05f3 100644 --- a/patches/chrome-browser-download-download_item_model.h.patch +++ b/patches/chrome-browser-download-download_item_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h -index 94d47afee871d2748e1b6fe2b69efec628c2b00c..30567b9c0909240b198f9eb7d6c057983364d36d 100644 +index 2ab1b7640b4bb8b0d2ca7cbec2b3902682751fef..231789a4b09409a589da51e1ccfebe91e50d0fcb 100644 --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h -@@ -104,6 +104,7 @@ class DownloadItemModel : public DownloadUIModel, +@@ -105,6 +105,7 @@ class DownloadItemModel : public DownloadUIModel, void OnDownloadDestroyed(download::DownloadItem* download) override; private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index bca6b9b46a9..2c4c2b7b5fe 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index d4435c818602265a09967e5a8afbc3e416796633..1b9bd42a76381f2953b8ddfa9ebc92af065a73d7 100644 +index 4f3f9f8d42c14ed8d088fb612b1007ef41dcdb86..58897cfcf2508fcf44a86d527950e6298d4cd92b 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1287,6 +1287,7 @@ static_library("extensions") { +@@ -1286,6 +1286,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 2d757ee4c94..c65b0d43c32 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index a4ac2264d34ecda35dd69df0fb88ebce8f613371..0e2a724e51ade09f11889c8fd17aec696b57a502 100644 +index 71b5343d18d5926ef5b915730e3b62013677a719..275052a20fac0c52bd568487b6308ca091f5e792 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -720,6 +720,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch index 37962f3043c..a6202e6ad0e 100644 --- a/patches/chrome-browser-extensions-extension_service.h.patch +++ b/patches/chrome-browser-extensions-extension_service.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h -index f86268b678f6699626b76c79f119b23c58343a53..2ddb1ad35b416281fd296aca27b080eaecd397c6 100644 +index 386fe6ec36f51052d19c264f0102c28a89f3b9dc..8fba85155d4eff4d8fee0dcb356b762e76dc527a 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h -@@ -461,6 +461,7 @@ class ExtensionService : public ExtensionServiceInterface, +@@ -460,6 +460,7 @@ class ExtensionService : public ExtensionServiceInterface, static base::AutoReset DisableExternalUpdatesForTesting(); private: diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 0430040afc7..e4a2adfb489 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -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 28672e8af478efed095039ea2522abf5bc75db94..8b38632a236fb0edf62624a164917ee68f7b0edc 100644 +index 1ecdb43d2c066da729aec706e4a6b2422c184110..f89eebff4030ea89661f19bf7ddd5244c7d60c3f 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -317,6 +317,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -312,6 +312,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-importer-external_process_importer_client.h.patch b/patches/chrome-browser-importer-external_process_importer_client.h.patch index b54b540894e..824c5479df8 100644 --- a/patches/chrome-browser-importer-external_process_importer_client.h.patch +++ b/patches/chrome-browser-importer-external_process_importer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h -index 4fbe0f4f068b138cf6f57e61f524f906e10db001..15d0315a248354ccd3957f138c7d8aba8570dc1a 100644 +index 27c85d41b2f6c0f9b52d7913b57f56790f509d70..b886b6465a35f25e99e43ac191dfc4f8cd2625c7 100644 --- a/chrome/browser/importer/external_process_importer_client.h +++ b/chrome/browser/importer/external_process_importer_client.h -@@ -83,6 +83,7 @@ class ExternalProcessImporterClient +@@ -82,6 +82,7 @@ class ExternalProcessImporterClient const std::vector& autofill_form_data_entry_group) override; diff --git a/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch b/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch index e719a111627..afa740f8aeb 100644 --- a/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch +++ b/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc -index 3b58b4c049952911e9bf5ade185159c850726e00..89c1070a584b8ccd74f5c824c0a7cf909b520273 100644 +index 92215c67de5e30e7ec6f7d203a84b842e635c53e..4fff694b2c8834ba9d93617eecc69a8c4c0ffdb3 100644 --- a/chrome/browser/importer/in_process_importer_bridge.cc +++ b/chrome/browser/importer/in_process_importer_bridge.cc @@ -54,6 +54,8 @@ history::VisitSource ConvertImporterVisitSourceToHistoryVisitSource( diff --git a/patches/chrome-browser-importer-in_process_importer_bridge.h.patch b/patches/chrome-browser-importer-in_process_importer_bridge.h.patch index 13f8a3d3cd7..abc1c9bdb38 100644 --- a/patches/chrome-browser-importer-in_process_importer_bridge.h.patch +++ b/patches/chrome-browser-importer-in_process_importer_bridge.h.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/importer/in_process_importer_bridge.h b/chrome/browser/importer/in_process_importer_bridge.h -index 54dfb87d9f773fc50199f915e79667474f8633bb..ff57982e72acb80e93e65ef271413a5d64fd8a2d 100644 +index 0e4514bc937b9b8b275409eee343a747b59adf30..1d3cef72ef64cf2c9b76d03f4009cf604929474b 100644 --- a/chrome/browser/importer/in_process_importer_bridge.h +++ b/chrome/browser/importer/in_process_importer_bridge.h @@ -56,6 +56,7 @@ class InProcessImporterBridge : public ImporterBridge { - base::string16 GetLocalizedString(int message_id) override; + std::u16string GetLocalizedString(int message_id) override; // End ImporterBridge implementation. + BRAVE_IN_PROCESS_IMPORTER_BRIDGE_H diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch index ef6f9c3bfa0..d6a7afd84df 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index c15186c8bd7892e8b1f351d6efc4cb1074b76417..4650f3caabc837e56e78cdaf1d759af3712ece7c 100644 +index 0110dc7c09e2ece5ed08881603c3d9d23205c9c5..a431db67fb85cd798a0fbdd846d73cde0a2447d0 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -223,7 +223,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem diff --git a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch index 33bea8ee721..f7690852853 100644 --- a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch +++ b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc -index 60018ca3e11392af2d1c398caee1f87d5703be51..7443189c884f0f734505bea49830666a5a002b85 100644 +index c50c2208e6c86efb462e19c25e7910d6b2436673..aec5d6bce4cc5f676caf613dc042d6c723e09b30 100644 --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc -@@ -122,6 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) +@@ -116,6 +116,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) std::make_unique()); } #endif diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch index 4b2faeac82f..b232fa360a8 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm -index ba8ae96bc6ae6c0dd9cfdf2c0c02418d4c6cc721..2beb3491fb0d122aaf14347a5b672e192ac23519 100644 +index 4151b15d357d40d650cb10f6df0edcd8149ba5bd..cf62779536ed2bcea27460cbf49375af43f6e9e3 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm -@@ -188,6 +188,7 @@ void NotificationPlatformBridgeMac::Display( +@@ -189,6 +189,7 @@ void NotificationPlatformBridgeMac::Display( } else { NSUserNotification* toast = [builder buildUserNotification]; [notification_center_ deliverNotification:toast]; diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac_utils.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac_utils.mm.patch index 9b0b417bbad..d4e2a804789 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac_utils.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac_utils.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac_utils.mm b/chrome/browser/notifications/notification_platform_bridge_mac_utils.mm -index e6c14e8ff6ef14c96c79d4f9cdd560d4dc5606cf..6afd680337a26fac864df0bf67a0f21617894ac4 100644 +index ad0db259032ee6bdadc69c985efb867b29e4ca70..b7ba06ef7061e92d3894c52a880c0d3025b13577 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac_utils.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac_utils.mm -@@ -59,6 +59,7 @@ void DoProcessMacNotificationResponse( +@@ -60,6 +60,7 @@ void DoProcessMacNotificationResponse( // call this method directly as SysInfo::OperatingSystemVersionNumbers might be // an expensive call. Instead use SupportsAlerts which caches this value. bool MacOSSupportsXPCAlertsImpl() { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 72a151172ab..75fa308b2e7 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 853eff92d2105eddb745999951eadabdf5f38400..dd410d463a232617237e0cc7cfd77f63b06337e1 100644 +index 7d0de7820fc60c1540d74e63a2cd50136b9b29e6..081d999e5146892b77bd81ff6d5c922ce11eb72d 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -878,6 +878,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -877,6 +877,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 853eff92d2105eddb745999951eadabdf5f38400..dd410d463a232617237e0cc7cfd77f63 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1158,6 +1159,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1162,6 +1163,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 5b732d81af6..72c00430d6d 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 8e8a7abdcf1746a1eb04a5a776afc488827ef334..da37943fae7f8c0b0884e2e0e1b494b7fd6d5d43 100644 +index 7340e9b38f3a4c4aa0b41929bf957e8f207ccfd4..3c1a0da0e76956d729657c940d52fdc7c09f2f92 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -90,6 +90,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { +@@ -89,6 +89,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { // DevTools::BrowserContext and MediaRouter::Presentation are an // exception to this ban. return *this == PrimaryID() || @@ -10,7 +10,7 @@ index 8e8a7abdcf1746a1eb04a5a776afc488827ef334..da37943fae7f8c0b0884e2e0e1b494b7 base::StartsWith(profile_id_, kDevToolsOTRProfileIDPrefix, base::CompareCase::SENSITIVE) || base::StartsWith(profile_id_, kMediaRouterOTRProfileIDPrefix, -@@ -247,7 +248,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -255,7 +256,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch index 0e60069a69f..9e9fc53e49b 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index 84ea1a7d3b4405276963c1d7e4c6b842824ccbbd..2e20f8073bc5438a09b7a535817a40873270ba94 100644 +index 0163a84851a0cdbc043744813b96622243572b3a..e2d9624d36465f57a234964c660f513453d687d9 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -345,7 +345,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 2b51eabc8fe..f368bf52e75 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index e33b9cff88277425838d52e09c2fafbb37d5e762..daa4df6bb79ae7fcfe11e9c8f6999be37c7ad2c0 100644 +index 57147cee0a8dbbddfa6839e6fbd574ca3169021e..832ecc9df9a642cb1f547c19ee4dc2b9c93cbc9a 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -400,7 +400,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -399,7 +399,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, NOTREACHED(); } diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index 70ec224dd4f..a2589d866d3 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index 743dccc6ddf4a06bc58436a1176e61135023c5e4..9cc9b2c72c19b8da36f2ed581610e0bfc8bf4cc5 100644 +index 952120b2bb7d659bf556178f86e70b7a701cf459..786416de151e974d898a6a58ca67bf1b1c62a8b6 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -294,6 +294,7 @@ class ProfileManager : public content::NotificationObserver, diff --git a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch index 8f9ffc3c243..71a8b443a9a 100644 --- a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch +++ b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc -index c7216d3988fb631a2ab03898846f4d1307d2f935..376e9936b06ab56c22d1810d7bb74de69f12f0f4 100644 +index a90e3d8a651dd854a86062934bd475d098f63f1a..85bbf76557b912c9c1a8d4005af55f72a409776f 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc -@@ -744,7 +744,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { +@@ -743,7 +743,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { // static std::unique_ptr ProfileShortcutManager::Create( ProfileManager* manager) { diff --git a/patches/chrome-browser-profiles-renderer_updater.cc.patch b/patches/chrome-browser-profiles-renderer_updater.cc.patch index 3073d96a0f0..ee583917484 100644 --- a/patches/chrome-browser-profiles-renderer_updater.cc.patch +++ b/patches/chrome-browser-profiles-renderer_updater.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profiles/renderer_updater.cc -index 04bbd816692bf994e87dd765ad9d10b45d7fe547..8d96b34247ee68a1f608479663f1528413c97653 100644 +index 8920c217f0b261e3d35de47b141f33624a763042..d1902d98daa8741f2141072f56a4f9c2c266f00f 100644 --- a/chrome/browser/profiles/renderer_updater.cc +++ b/chrome/browser/profiles/renderer_updater.cc @@ -51,6 +51,7 @@ void GetGuestViewDefaultContentSettingRules( diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 00e2c7ea4e6..e1147b49718 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -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 b88a6eabbfed4462d524023ec52665a021ed2c05..7ec96b0e60ec90363b67907e9a60c59ad1a38c37 100644 +index 1263b381c22c850abbdc66596f0398cc699b6719..e74355202945adf31f44b223b4b5791276c40f80 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1675,6 +1675,7 @@ void RenderViewContextMenu::AppendSearchProvider() { @@ -8,5 +8,5 @@ index b88a6eabbfed4462d524023ec52665a021ed2c05..7ec96b0e60ec90363b67907e9a60c59a return; + BRAVE_APPEND_SEARCH_PROVIDER - base::string16 printable_selection_text = PrintableSelectionText(); + std::u16string printable_selection_text = PrintableSelectionText(); EscapeAmpersands(&printable_selection_text); diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 5a4df2e5750..076f4106538 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 25f331b10b0132f5f59a3bfa78a7db4fc0182fdf..428e5adfd0f55e7ad2774e7df2a54dd635b06736 100644 +index 1b0a3b4dbe000caf9cb82cbe9ce5e0bd1b7d1186..791830f822240bfee3c46d46afb12136432ffe97 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -117,6 +117,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { +@@ -116,6 +116,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { // Returns true if keyboard lock is active and requires the user to press and // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; diff --git a/patches/chrome-browser-resources-history-history_item.js.patch b/patches/chrome-browser-resources-history-history_item.js.patch index ccdf1b4ed93..a5b796700ba 100644 --- a/patches/chrome-browser-resources-history-history_item.js.patch +++ b/patches/chrome-browser-resources-history-history_item.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history_item.js b/chrome/browser/resources/history/history_item.js -index 9a651df9a0bf6afe8d632f561c9440ebcefe3b4a..56cc8b24ed835e3c49bdfbeb70dc11cdf6540e82 100644 +index a1e03d7e7217845044593368816de644d8346fc1..2db1ab547781427827fc77c51698873fc578b0cb 100644 --- a/chrome/browser/resources/history/history_item.js +++ b/chrome/browser/resources/history/history_item.js @@ -9,6 +9,7 @@ import 'chrome://resources/cr_elements/cr_icons_css.m.js'; diff --git a/patches/chrome-browser-resources-history-history_toolbar.js.patch b/patches/chrome-browser-resources-history-history_toolbar.js.patch index a32e6567a40..d5b3f171264 100644 --- a/patches/chrome-browser-resources-history-history_toolbar.js.patch +++ b/patches/chrome-browser-resources-history-history_toolbar.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history_toolbar.js b/chrome/browser/resources/history/history_toolbar.js -index b32eebcf69cd42e72ad7231c4623209c188de23e..37a9bcf669d2242aabd5b3513308ff4485e0fda2 100644 +index 0e5a49f707bf49f40b726f2bc3e8de629354acff..32af7450688ac1538ccc0f35aa2ed567e79c2f15 100644 --- a/chrome/browser/resources/history/history_toolbar.js +++ b/chrome/browser/resources/history/history_toolbar.js @@ -3,7 +3,7 @@ @@ -9,5 +9,5 @@ index b32eebcf69cd42e72ad7231c4623209c188de23e..37a9bcf669d2242aabd5b3513308ff44 -import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; +import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js' import './shared_style.js'; - import './strings.js'; + import './strings.m.js'; diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 66071bf155b..32ee7a0d584 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index b752f26146d90c86475be28fe2a5da68e0358749..64fbf76dfbed0a52a173e63cf34d71dc81971c74 100644 +index cdf4406a57c01010f065948d04f9c7a2219db82f..703af55d0a81da6195962f141a9beb5d6747b51f 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -46,6 +46,7 @@ if (optimize_webui) { +@@ -44,6 +44,7 @@ if (optimize_webui) { "chrome://resources/mojo/mojo/public/js/bindings.js", "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js", ] @@ -10,7 +10,7 @@ index b752f26146d90c86475be28fe2a5da68e0358749..64fbf76dfbed0a52a173e63cf34d71dc } } -@@ -93,6 +94,7 @@ generate_grd("build_grd") { +@@ -91,6 +92,7 @@ generate_grd("build_grd") { "$target_gen_dir/$preprocess_gen_manifest", ] } diff --git a/patches/chrome-browser-resources-settings-about_page-about_page.js.patch b/patches/chrome-browser-resources-settings-about_page-about_page.js.patch index bac9a5c405b..fb48074343e 100644 --- a/patches/chrome-browser-resources-settings-about_page-about_page.js.patch +++ b/patches/chrome-browser-resources-settings-about_page-about_page.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js -index 05ca4e7b79b61bf3252803192349cf6904d1fa97..f4356921b6ca25620caa90b63f337c73ad59930c 100644 +index 0ad751db704a7abe32753d4c367cc25bc9a61b45..597bee123d6da7cb5608fd364173cd548a465a5a 100644 --- a/chrome/browser/resources/settings/about_page/about_page.js +++ b/chrome/browser/resources/settings/about_page/about_page.js @@ -213,7 +213,14 @@ Polymer({ diff --git a/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch b/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch index 862567f0d2b..742a0eae987 100644 --- a/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch +++ b/patches/chrome-browser-resources-settings-lifetime_browser_proxy.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/lifetime_browser_proxy.js b/chrome/browser/resources/settings/lifetime_browser_proxy.js -index d109348290ecf852da38a0da26abac5798f9d89c..1b825fde7f16f17a6d75126a8cb1670e47314d05 100644 +index 995719c65672c1d577133c981ed570a6dab95882..b3fb0426ebe1c23a8d837529508562f4a81cb969 100644 --- a/chrome/browser/resources/settings/lifetime_browser_proxy.js +++ b/chrome/browser/resources/settings/lifetime_browser_proxy.js -@@ -15,6 +15,13 @@ cr.define('settings', function() { +@@ -14,6 +14,13 @@ import {addSingletonGetter} from 'chrome://resources/js/cr.m.js'; // Triggers a browser relaunch. relaunch() {} @@ -16,7 +16,7 @@ index d109348290ecf852da38a0da26abac5798f9d89c..1b825fde7f16f17a6d75126a8cb1670e // // First signs out current user and then performs a restart. signOutAndRestart() {} -@@ -41,6 +48,13 @@ cr.define('settings', function() { +@@ -40,6 +47,13 @@ import {addSingletonGetter} from 'chrome://resources/js/cr.m.js'; chrome.send('relaunch'); } diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch index 8740593df4e..4f9a0c4d9af 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js -index 2b737b6877a0bc78869b073e00db772c64de3445..114f4b8a5f62f4f41eae39489adfbf1e81e4a49d 100644 +index 5b3bfa1df6f878745d372bd72787c01c0fcb165b..c9350cfefe0947e2063cf3226eab6674c6520d2c 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.js +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js -@@ -34,7 +34,7 @@ Polymer({ - /** @type {settings.SyncStatus} */ +@@ -54,7 +54,7 @@ Polymer({ + /** @type {SyncStatus} */ syncStatus: Object, - // @@ -11,16 +11,16 @@ index 2b737b6877a0bc78869b073e00db772c64de3445..114f4b8a5f62f4f41eae39489adfbf1e // TODO(dbeam): make a virtual.* pref namespace and set/get this normally // (but handled differently in C++). /** @private {chrome.settingsPrivate.PrefObject} */ -@@ -77,7 +77,7 @@ Polymer({ +@@ -97,7 +97,7 @@ Polymer({ ready() { - this.browserProxy_ = settings.PrivacyPageBrowserProxyImpl.getInstance(); + this.browserProxy_ = PrivacyPageBrowserProxyImpl.getInstance(); - // + // const setMetricsReportingPref = this.setMetricsReportingPref_.bind(this); this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref); this.browserProxy_.getMetricsReporting().then(setMetricsReportingPref); -@@ -108,7 +108,7 @@ Polymer({ +@@ -128,7 +128,7 @@ Polymer({ return /** @type {?CrToggleElement} */ (this.$$('#driveSuggestControl')); }, @@ -29,7 +29,7 @@ index 2b737b6877a0bc78869b073e00db772c64de3445..114f4b8a5f62f4f41eae39489adfbf1e /** @private */ onMetricsReportingChange_() { const enabled = this.$.metricsReportingControl.checked; -@@ -158,6 +158,7 @@ Polymer({ +@@ -178,6 +178,7 @@ Polymer({ }, // @@ -37,7 +37,7 @@ index 2b737b6877a0bc78869b073e00db772c64de3445..114f4b8a5f62f4f41eae39489adfbf1e /** * @return {boolean} * @private -@@ -206,6 +207,7 @@ Polymer({ +@@ -226,6 +227,7 @@ Polymer({ } this.showSignoutDialog_ = false; }, diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index 9073db79552..92a727861e7 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -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 aa41922b9cd2b17327b3d418b02064938eadcbb2..980fdbcf4ff5691692f02bc40504c66aa1864b12 100644 +index 43947cf0e369c8df0608c1ac4b200f1f0ef5cf2a..3fdf026a9da02506ccbe30bb02bfede2273fcf9e 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -29,6 +29,7 @@ @@ -26,7 +26,7 @@ index aa41922b9cd2b17327b3d418b02064938eadcbb2..980fdbcf4ff5691692f02bc40504c66a diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch index 7595894602c..9d0ebe39ded 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch @@ -1,11 +1,11 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js -index 5480679df73f36da15015667e5b0b9d3cf06acf7..3cc9006da60b67d98a58d631bddd4ccd24eae26c 100644 +index addfd5bafa78743a13b7c885db680d077783552f..1306a88fb50151c2d96069ba3b44d27c7bc43448 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js @@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; - import '../settings_page/settings_animated_pages.m.js'; - import '../settings_page/settings_subpage.m.js'; - import '../settings_shared_css.m.js'; + import '../settings_page/settings_animated_pages.js'; + import '../settings_page/settings_subpage.js'; + import '../settings_shared_css.js'; +import './personalization_options.m.js'; import {assert} from 'chrome://resources/js/assert.m.js'; diff --git a/patches/chrome-browser-resources-settings-route.js.patch b/patches/chrome-browser-resources-settings-route.js.patch index 87cf0e3af2e..1b25dfa73e1 100644 --- a/patches/chrome-browser-resources-settings-route.js.patch +++ b/patches/chrome-browser-resources-settings-route.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js -index 1ad97e52f84fb6b041df2bf2602ec338c3f61d66..efad77cb427900ddb751cfc26e9fd684d8e1affb 100644 +index 60ac6a6d04b4b4c86422fe9f727bfcd62978aa8d..f54d60618698535cadc09d15d1019586b8c59bb3 100644 --- a/chrome/browser/resources/settings/route.js +++ b/chrome/browser/resources/settings/route.js @@ -36,7 +36,9 @@ function addPrivacyChildRoutes(r) { diff --git a/patches/chrome-browser-resources-settings-settings.js.patch b/patches/chrome-browser-resources-settings-settings.js.patch index 40113ceb58b..45e7e53a61e 100644 --- a/patches/chrome-browser-resources-settings-settings.js.patch +++ b/patches/chrome-browser-resources-settings-settings.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.js b/chrome/browser/resources/settings/settings.js -index 6eab3208062ea0852e065ca1488c45f0348f9deb..a370c4423c21f8310b9fd41160d65370f74e1ea0 100644 +index e8f45136edd3d1558a9afe7c45219ae37aa36877..142cf2c52728c2f400267d50c2ee4ff9ef9a3918 100644 --- a/chrome/browser/resources/settings/settings.js +++ b/chrome/browser/resources/settings/settings.js @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch index a8434940d8b..ecaf6e8368b 100644 --- a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch +++ b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js -index 05560e75967d8033d66181168a6d68032d2e57be..95e38d61bbafbab7d62e1f8c6b7c0bfd57c7e0f1 100644 +index 9216415a0b2ad96e098672454ee09671a736aa9b..076c845668774de2b0a4e1dbe34aa522e0a91aed 100644 --- a/chrome/browser/resources/settings/settings_ui/settings_ui.js +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js @@ -12,7 +12,7 @@ diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch index fdd20ed2e33..ee2da65379a 100644 --- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch +++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.js b/chrome/browser/resources/settings/site_settings/category_default_setting.js -index f1aeec3e53c7c7d196111d4260b6ae6a85b02895..396dae1f7a26bb2582d19d58d37030d1dcab53c7 100644 +index e3552c2f256fe5fd37736971efda53630659f3a7..da47fbabcab10a21677424fc1ef213711fa0f949 100644 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.js +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.js @@ -165,6 +165,7 @@ Polymer({ diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_creation_flow-local_profile_customization.html.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_creation_flow-local_profile_customization.html.patch index deeee5361b4..e28969aadd2 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_creation_flow-local_profile_customization.html.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_creation_flow-local_profile_customization.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/local_profile_customization.html b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/local_profile_customization.html -index 429b10a04532c4396002e74ff4693241a6a0cf85..4e34cad1382dd943957015ea499cd496bf22c330 100644 +index bbc4772a881ded6264dfd95ac61703929abc68b1..14ff65e950c73496d1e0fdbec1cf30e5eec76a84 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/local_profile_customization.html +++ b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/local_profile_customization.html -@@ -152,6 +152,7 @@ +@@ -155,6 +155,7 @@ #doneButton { width : 32px; } diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch index 3030fe0b3f2..12131974017 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js -index f1c5345ec0b62325e5829325723c90b6a5de30c1..6b392a9882925c09fde10ce45e8db41d96fee11b 100644 +index 2b0cc9a8e244f81822cbbb34db915e8dd764a93a..189aef26ce2e3ed630bd5f7bdcf052a45b9c5725 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js @@ -87,6 +87,7 @@ Polymer({ diff --git a/patches/chrome-browser-resources-tools-optimize_webui.gni.patch b/patches/chrome-browser-resources-tools-optimize_webui.gni.patch index 9c887087144..cb1884cfee2 100644 --- a/patches/chrome-browser-resources-tools-optimize_webui.gni.patch +++ b/patches/chrome-browser-resources-tools-optimize_webui.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/tools/optimize_webui.gni b/chrome/browser/resources/tools/optimize_webui.gni -index 5bcdb42a7d8f1443fefa4c81eb7e9757bc45eaa0..9e7ab09670452b3a9db5b768edc6696076b14ba6 100644 +index 88d4b6fde396442bcb3284451552382ec9146890..8c52b570ff74541600e91e805c5fd2af1f19235e 100644 --- a/chrome/browser/resources/tools/optimize_webui.gni +++ b/chrome/browser/resources/tools/optimize_webui.gni -@@ -78,6 +78,7 @@ template("optimize_webui") { +@@ -73,6 +73,7 @@ template("optimize_webui") { "chrome://resources/polymer/v3_0/|$polymer_path", "chrome://resources/|$resources_path", ] diff --git a/patches/chrome-browser-shell_integration_linux.cc.patch b/patches/chrome-browser-shell_integration_linux.cc.patch index 201d9d3e3e3..eff153d749b 100644 --- a/patches/chrome-browser-shell_integration_linux.cc.patch +++ b/patches/chrome-browser-shell_integration_linux.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc -index c377440dfd193676305f803766235c84ecf8db79..fd505fefcfb358713dedc297a8dd263b7ddc5341 100644 +index bbbf6dbb8d1706eace6219b453c13152dbf2de32..a9db1ba0b403921f121bbb0647ab290e7d6d2ad8 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -415,7 +415,7 @@ std::string GetIconName() { diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 5af85cd60f6..c42a05944d6 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 4dbdfc0c32c6ff789f2e05f7013997b9ce310818..03d1ff3a49eb81161e9f31c54d82ab1a75b8f624 100644 +index a16385039ec731b0d7ee55e2f08ab8ef74679665..487e750206f4402f9178b861f0c451c09a0c62f9 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -598,6 +598,7 @@ static_library("ui") { +@@ -602,6 +602,7 @@ static_library("ui") { "//ui/webui/resources/cr_components/customize_themes:mojom", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 4dbdfc0c32c6ff789f2e05f7013997b9ce310818..03d1ff3a49eb81161e9f31c54d82ab1a # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3318,10 +3319,13 @@ static_library("ui") { +@@ -3352,10 +3353,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index 2944006eb96..d515e222b2d 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -index 8195ba51211467d3a987c3915412ab500e745ce5..e7fd504035747b4f600f771038bab54200949593 100644 +index 3cf99f06cda44b1d61525ef738e9f1cc05b62f9b..eb7ca72005d2271bfef1c0ace66abb9ddb3bfeda 100644 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -220,6 +220,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -211,6 +211,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler mPopup.setOutsideTouchable(true); if (!isByPermanentButton) mPopup.setAnimationStyle(R.style.OverflowMenuAnim); diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 1f9880c8f9d..f6f11d0c624 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 2f2862c426124556e1109dd243475d8514c814d8..d004e4e662564d9c3693fc6ed25f5e56504e4054 100644 +index 354072b39cccfe4b343915a4bb434e1714136d97..a680fa310e9118d16295509a333620043abcd02d 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -429,6 +429,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { +@@ -428,6 +428,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { // static Browser* Browser::Create(const CreateParams& params) { CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index 2f2862c426124556e1109dd243475d8514c814d8..d004e4e662564d9c3693fc6ed25f5e56 return new Browser(params); } -@@ -440,7 +441,7 @@ Browser::Browser(const CreateParams& params) +@@ -439,7 +440,7 @@ Browser::Browser(const CreateParams& params) tab_strip_model_delegate_( std::make_unique(this)), tab_strip_model_( diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch index a113a10aae1..7eae3c3b882 100644 --- a/patches/chrome-browser-ui-browser.h.patch +++ b/patches/chrome-browser-ui-browser.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index 3a0202c2139b3a6d62f10d9ce965e689dc96bf4a..415c4e503392698fc4c5222acf976b459f071daa 100644 +index f1c66751bff73836e58c6550f16dba060b88bd8d..17c3b6b47cc8fb65d9d474fc41ebe79250cdbed6 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -703,6 +703,7 @@ class Browser : public TabStripModelObserver, +@@ -701,6 +701,7 @@ class Browser : public TabStripModelObserver, StatusBubble* GetStatusBubbleForTesting(); diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index 501014b3ab8..e178f699084 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index 019834353c0280109a5598c8b1920d703849fcc7..1e84cc6e768e550a266acc6499a0f076d82755be 100644 +index e80783549c9ed94c7e7c422fec91bb9196a1a27b..8730948a13b2addfed9cd51c5b6b17b8e47a16d3 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -488,6 +488,7 @@ void Navigate(NavigateParams* params) { @@ -10,7 +10,7 @@ index 019834353c0280109a5598c8b1920d703849fcc7..1e84cc6e768e550a266acc6499a0f076 // Open System Apps in their standalone window if necessary. // TODO(crbug.com/1096345): Remove this code after we integrate with intent -@@ -752,6 +753,7 @@ void Navigate(NavigateParams* params) { +@@ -747,6 +748,7 @@ void Navigate(NavigateParams* params) { bool IsHostAllowedInIncognito(const GURL& url) { std::string scheme = url.scheme(); base::StringPiece host = url.host_piece(); diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index 94788b8d31b..bba397edebe 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index 4cc51634446256d59b2c8b13903c014d67081618..7d0ba9c605c92646abc58bd382056c10791dd19d 100644 +index f99668208b510f8ba427f3c9c579d43323e4b906..5b397d61ff7babf4c505820600a7d4823b55b7de 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc @@ -307,7 +307,7 @@ void ShowSlow(Browser* browser) { diff --git a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch index 8cef2e15026..4ae70f890f0 100644 --- a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch +++ b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch @@ -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 613fb241c2c83b2431316bf65e33a6a9c0f133d5..a80069fb800e8c9976ccfb892a3130085bbd5a33 100644 +index 68444f1c8f33209f86c1baf62f3abcbd61e161e3..7cdac3714cb999184748be147596cec5edfb4f73 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 BuildFileMenu( diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch index 1ee9cdc9cc3..8e64b3c8588 100644 --- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch +++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc -index 43b2117ff3b33f9218c48ce60411319a0e4e5251..790307ee419c19e83295291547a9143947681187 100644 +index f7aeff110876ad3e58e607954b4f413b965482d5..483941798f17a2e2c96788270f82208ae554ee69 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc -@@ -61,7 +61,6 @@ ExtensionActionViewController::ExtensionActionViewController( +@@ -59,7 +59,6 @@ ExtensionActionViewController::ExtensionActionViewController( icon_factory_(browser->profile(), extension, extension_action, this), extension_registry_( extensions::ExtensionRegistry::Get(browser_->profile())) { diff --git a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch index c81a3872ad3..88648658660 100644 --- a/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch +++ b/patches/chrome-browser-ui-extensions-extension_action_view_controller.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.h b/chrome/browser/ui/extensions/extension_action_view_controller.h -index 9bce34b47f905f5e31d5be99b71d94a73495de09..36c5dca52959a3248768ae81a23bc2b6ef0ed761 100644 +index df4812222b3bd8ec537eb78da003bd72e48a3644..def9f287f2efefdcc84863208e2e81a7ae7cd89b 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.h +++ b/chrome/browser/ui/extensions/extension_action_view_controller.h @@ -15,6 +15,7 @@ diff --git a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch index c26d759c19e..1b07e1b26b8 100644 --- a/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch +++ b/patches/chrome-browser-ui-extensions-icon_with_badge_image_source.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc -index 0a0b06b2c656020ce1bc35f2db3387953c74f213..6a2b547d20fb6f8a02718698db4fc145a1f7f167 100644 +index 1c200609dbc7fcfc502fb2b23822aed4d958ddf1..02265f9d10ba628b1255abe3f80db6a00165e866 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc @@ -146,6 +146,7 @@ void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) { diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 914d50a0e38..42eab4f658b 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -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 f4b05907c672aa40febf46391aaad76c99038980..37deb6ee7e0b809918411944e35394d2cd264426 100644 +index 01c4170fc9ea802e40e8202642e2c61e09de8d0c..b457be5c9474454c41d1a6f4e586f08d7ad429e5 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -338,6 +338,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -346,6 +346,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #if !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index fcfaa428ba5..2bd0d67f5b6 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 1d8f6ee93fe8cc67405053e09845b7b8c700c027..153d553e8d7b847fcaed0b95eb324584325fe32e 100644 +index d2b75343e870e581fb2b77ed913180c35d98d202..270f137fd7d2bdcb5b2a9f804424cfa7e02ae863 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -498,4 +498,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -507,4 +507,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. diff --git a/patches/chrome-browser-ui-tabs-tab_style.cc.patch b/patches/chrome-browser-ui-tabs-tab_style.cc.patch index 0803c6fa76c..ae9d08e7321 100644 --- a/patches/chrome-browser-ui-tabs-tab_style.cc.patch +++ b/patches/chrome-browser-ui-tabs-tab_style.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/tab_style.cc b/chrome/browser/ui/tabs/tab_style.cc -index ccf846d78009892396bcd66570c7d6efa48b452a..828854c620d6132ed331af38c1c6c34798c16032 100644 +index 8ffa7256f8a7cd397c06e45a7e2d22cb0c687ecd..4338c93844ab9203aa53f0c622dac6cf28f24913 100644 --- a/chrome/browser/ui/tabs/tab_style.cc +++ b/chrome/browser/ui/tabs/tab_style.cc @@ -15,7 +15,7 @@ constexpr int kSeparatorThickness = 1; diff --git a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch index 183542d12c3..5750d94aeb5 100644 --- a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch +++ b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch @@ -1,5 +1,5 @@ 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 94d12c1caaec253725a65147804997a12e4b398b..7d936e7570a4b7430ef429c5b0e14a53a0a960bc 100644 +index 3071cb2cf4bb88f0f2ec1ef62dff9134d2d5eaba..25012166f5c42a31226d213c766cfaee65da177f 100644 --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h @@ -57,6 +57,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate { diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch index 32f26de5e82..3f487604d0a 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -index 3e14de58d81abd3dca60b9540112157cff466828..028aa46dcd732b870a228e8b3f90f06f309cdb23 100644 +index 64af54b946b6fdea1651574b1461ae655df66bb2..85441cb2cd0c76174a9118ef6c7ad711dab444ee 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -479,6 +479,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch index 071b99a0f54..ccbdc9f942c 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc -index fa7f59a62b1e3bee61cd70d9fd57a79cf0682b3d..eee70892ca304840e5ca4efede7d5ae552f651a9 100644 +index 9c8501fdad6d21934952a3a16af96a1a8c33fd62..8f966f150dadc589945b21d73fb2e20c5584829d 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc @@ -675,6 +675,7 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) { @@ -9,4 +9,4 @@ index fa7f59a62b1e3bee61cd70d9fd57a79cf0682b3d..eee70892ca304840e5ca4efede7d5ae5 + BRAVE_MAX_TABS_PER_SESSION_AND_RECENCY EXPECT_EQ(9, num_items); - std::vector tab_titles = + std::vector tab_titles = diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 0cd1be37ac6..b72ee9be7a2 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -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 371bcf5d3c4b7225c2fccffed59a5d1747289e62..83141e0e413864d05f21970a5dcc78cae392a85c 100644 +index d5e00c1b683a024f63aa4ad19772fa9e98000904..370284f5e3fc87839d36533608ac8726f6bf5833 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -862,6 +862,7 @@ void BookmarkBarView::Layout() { @@ -7,6 +7,6 @@ index 371bcf5d3c4b7225c2fccffed59a5d1747289e62..83141e0e413864d05f21970a5dcc78ca } } + BRAVE_LAYOUT - + // Layout the right side buttons. x = max_x + bookmark_bar_button_padding; diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch index c3d2f402844..a52362f10f6 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch @@ -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 374484e5e1f3e091cb6ed92ce09374ad11cd5c7e..6f1b99fa85957bdb060d5bd9ccd9358115fd6329 100644 +index beef588b1fe0d68592ffa063203fa9f773da916f..d102c80c45637742e9d8ff402de9bf78e61a871e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -226,6 +226,7 @@ void BookmarkBubbleView::ShowBubble( diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch index 863950e187b..380d0757ae0 100644 --- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch +++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h -index dff79a4cc6b0c9d6661535285ecf0f9fe534abab..acf63aefd2681280e0a43151d907f395b41ecbb7 100644 +index 76f8240995ed4f2d52318a57fa7e0b13b862511a..42187aa41cb392dacdbc1d97adab35694e94d347 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, diff --git a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch index a8a9a4b5b6b..51766bff75f 100644 --- a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc -index 36284fc6e88fb565f178430a71b7420082782600..d8bd6ffedbe5c0b741d231d87baf1b6eeee21d5f 100644 +index e774d964ecfec40976208160de61e42f2f2a1bb6..1e0d4784af03408a4dff355c88134b85e5eb8b65 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc -@@ -78,7 +78,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const { +@@ -75,7 +75,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const { void ExtensionPopup::AddedToWidget() { BubbleDialogDelegateView::AddedToWidget(); diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch index 3be7cb0d3c8..3ae1dd5127c 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch @@ -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 e4955ccbb929e90aa9de4494ec90f70e35ae0a44..400700dc87acee4de92de459c0c8fa7ca26eb9a2 100644 +index e6ed62e43a678083e3517b8f604ea2af7a0a1414..015ebbe298b9a716286322b5a6d40f78f5b2e2de 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -617,6 +617,7 @@ class BrowserView : public BrowserWindow, +@@ -620,6 +620,7 @@ class BrowserView : public BrowserWindow, return accessibility_focus_highlight_.get(); } diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 6e211c3883c..cf537026178 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -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 938538e8dc5b0697774ddb60065fa9fa4f9f9ff1..639ed74e6f7c37a46e9ceefa92f8a1b4c88848c8 100644 +index 1334e42dc26d03e03d288f93184b7d1c981d4c3c..2de836fd2f12798c84474250aa5d3986dd633e74 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -582,6 +582,7 @@ void LocationBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index 07714cac777..e22669053d3 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index b5b8cb92f116c95604b1d10ed4b4de32f21ab2b9..0be154dae3a947863741fafca1240ae9f955f1d0 100644 +index f20833babe641c5d6211990de548546034c781af..bb01ec0c7a4e28fcf9731fc037639e092f64b172 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -110,6 +110,7 @@ class LocationBarView : public LocationBar, diff --git a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch index 26414343bb0..3d4abc01b78 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc -index 8c38af079abb479d358fa295b109593bd5266a8d..e171915cf7d27930e2990443e34a3a52f8f4257f 100644 +index 1aced6efa8d620af84bc517ee72e572e33b1cc75..d86b3dbbc2f5e9317c1c80de8b17c9791d1e9479 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc @@ -134,6 +134,7 @@ bool LocationIconView::GetShowText() const { diff --git a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch index d58a17520cc..3c3ea5f9a73 100644 --- a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc -index 3feddc53c20ef5c90e0c135fba3897204d8586d9..444f4bdc9fdfa9f09f39e05114e9805891b41fc5 100644 +index 034dbcd3cc442428ade41df7764069715e79e19c..c6554a0bfe23a6f51808f484cade4e6fa4fc4521 100644 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc @@ -134,6 +134,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( @@ -8,5 +8,5 @@ index 3feddc53c20ef5c90e0c135fba3897204d8586d9..444f4bdc9fdfa9f09f39e05114e98058 AddRequestLine(request); + BRAVE_PERMISSION_PROMPT_BUBBLE_VIEW - base::Optional extra_text = GetExtraText(); + base::Optional extra_text = GetExtraText(); if (extra_text.has_value()) { diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch index ecd24b72800..11e8bc3be3b 100644 --- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch +++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -index 61467ccc646378a8123969ad68ba80ef0dbc6f05..da9847132c374295d46a0c8568a92024193a815a 100644 +index 45c22690dfffb1e039f026c3edf4191f06686912..614e65a931db0f64504e736e62ed86994e2407a5 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h @@ -70,6 +70,7 @@ class AvatarToolbarButton : public ToolbarButton, diff --git a/patches/chrome-browser-ui-views-profiles-incognito_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-incognito_menu_view.h.patch index 0f400ed5a49..f45b631d19a 100644 --- a/patches/chrome-browser-ui-views-profiles-incognito_menu_view.h.patch +++ b/patches/chrome-browser-ui-views-profiles-incognito_menu_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/incognito_menu_view.h b/chrome/browser/ui/views/profiles/incognito_menu_view.h -index 60c25ba033d5cf3c4720088607df6787db86db57..2462caa6c1b9222f69a027c28da0b246271b2e1a 100644 +index 8252c18a6b0603a16862b94b361eb0536da08cb9..3b187b2780c7002ed2c9003d3b70288d0a893656 100644 --- a/chrome/browser/ui/views/profiles/incognito_menu_view.h +++ b/chrome/browser/ui/views/profiles/incognito_menu_view.h @@ -30,6 +30,7 @@ class IncognitoMenuView : public ProfileMenuViewBase { @@ -9,4 +9,4 @@ index 60c25ba033d5cf3c4720088607df6787db86db57..2462caa6c1b9222f69a027c28da0b246 + BRAVE_INCOGNITO_MENU_VIEW_H_ private: // views::BubbleDialogDelegateView: - base::string16 GetAccessibleWindowTitle() const override; + std::u16string GetAccessibleWindowTitle() const override; diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch index 188731e2b2a..cffbddf39c1 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h -index e626eae939ff4e6fc915583f3180038784f6c44d..7fe9fbb1482b7989241830a54224cf54ea22da0e 100644 +index a937d8faa15c8c4de6a9926865f42e412b56f98b..286bc371d2e28aca676197ff758d7ef500768a6c 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h @@ -46,6 +46,7 @@ class ProfileMenuView : public ProfileMenuViewBase { diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch index 74c068e92a4..67711522f5d 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -index 43b8d86c36cd164b515b0ab7345955a491437dd0..f78f2d5689e1e3a93a4e991ace5a94a53f0c14ad 100644 +index db1105c9a1777b8e2894bc8b7344ee1a611596ce..5c90ce398f70bc4e1fc7f97aa471f1c4ea20cd94 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h @@ -169,6 +169,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, diff --git a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch index 2402657d762..d6ea410fa98 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -index 76aedb9ff3a51fc41649a16b4731cb0a98035e01..9cd973cbb4e9ee455f867007ba592f91c9b259b8 100644 +index 8f0f84a46bd2604792b6198dc7f83c31a2549aca..de714b41d0b2996692484a760544e553a83927aa 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h +++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -@@ -72,6 +72,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { - last_mouse_exit_timestamp_ = last_mouse_exit_timestamp; - } +@@ -50,6 +50,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { + void ClearPreviewImage(); + void SetPreviewImage(gfx::ImageSkia preview_image); + BRAVE_TAB_HOVER_CARD_BUBBLE_VIEW_H_ private: diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch index 12b42b21a47..520893201a7 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch @@ -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 2055a0d14bb2d1b66c6b41a5d7ce46b187f9cee6..b6479c7fcefebdb628d1665e54aff160b7a872d5 100644 +index fe22e6cc316b5fc591e743eecc0f54b18f5c6c16..94c516d4893d43bee537640f4d218c02dc72d190 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc @@ -67,6 +67,7 @@ class GM2TabStyle : public TabStyleViews { diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 0de37e41413..f7b6b03d887 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -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 54ba2047729f1f0432bef0309730d891e42b3087..b6ba052bf500d96114d2f3ae6bb52e7034979246 100644 +index e50f42823746c1a3f512166f9993ce6474c19fbe..359d6438e45f3c1dedae1a96bcd89f691b28be55 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -301,7 +301,7 @@ void ToolbarView::Init() { +@@ -312,7 +312,7 @@ void ToolbarView::Init() { } else { // TODO(crbug.com/932818): Remove this once the // |kAutofillEnableToolbarStatusChip| is fully launched. diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch index 6d36a4dbe98..82743b06cda 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h -index 0b3492e045424e56b0cce1bafdfd9006629e2776..1a9e8521fd81b9c9f5597c10e49903bb9a90c51b 100644 +index 78e996b7ddaa4423a9ef1551bc7b5ac1c7fb49dd..cc7f87a4c2da28db59e7f2f361ab4994d91cdff8 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h -@@ -94,12 +94,14 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -95,12 +95,14 @@ class ToolbarView : public views::AccessiblePaneView, ~ToolbarView() override; // Create the contents of the Browser Toolbar. @@ -17,7 +17,7 @@ index 0b3492e045424e56b0cce1bafdfd9006629e2776..1a9e8521fd81b9c9f5597c10e49903bb void Update(content::WebContents* tab); // Updates the visibility of the custom tab bar, potentially animating the -@@ -130,6 +132,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -131,6 +133,7 @@ class ToolbarView : public views::AccessiblePaneView, IntentPickerResponse callback); // Shows a bookmark bubble and anchors it appropriately. @@ -25,15 +25,15 @@ index 0b3492e045424e56b0cce1bafdfd9006629e2776..1a9e8521fd81b9c9f5597c10e49903bb void ShowBookmarkBubble(const GURL& url, bool already_bookmarked, bookmarks::BookmarkBubbleObserver* observer); -@@ -196,6 +199,7 @@ class ToolbarView : public views::AccessiblePaneView, - void ChildPreferredSizeChanged(views::View* child) override; +@@ -199,6 +202,7 @@ class ToolbarView : public views::AccessiblePaneView, + friend class AvatarToolbarButtonBrowserTest; protected: + friend class BraveToolbarView; // This controls Toolbar, LocationBar and CustomTabBar visibility. // If we don't set all three, tab navigation from the app menu breaks // on Chrome OS. -@@ -247,6 +251,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -250,6 +254,7 @@ class ToolbarView : public views::AccessiblePaneView, void OnChromeLabsPrefChanged(); // Loads the images for all the child views. diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch index 4760dbe9756..4858e9b3e48 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc -index 18346e33e9280b56cf369d41dddb9e99feb02f61..8a74861300058355bb2f2a93358d518057916afe 100644 +index 1fcb2d15f2af9a136f1c4be7f060d05e9bede168..81b8d8e9bed3e13c70de2109aad320187c414162 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc @@ -183,7 +183,7 @@ views::Widget* TranslateBubbleView::ShowBubble( diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch index 840b98ab6c2..b630e0f875a 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch @@ -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 22ad5145ffdbee32f2a2d5a10aab294cedd06c05..066ab765b97e4fbfc68137f17dcbd51acd57046d 100644 +index f8685459a875480b5b428bd04a859210316139df..d8ff61490ce2c1c5460a31a485cf024c01123e7c 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.h +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h -@@ -95,6 +95,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView, +@@ -94,6 +94,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView, // Returns the current view state. TranslateBubbleModel::ViewState GetViewState() const; diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch index 294406b0eeb..2cfdb589c04 100644 --- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -index 155e3aa532d9dc1a82b90277fe96e28ba1efd6cd..7e0eb652845fb15c936fccad28956da3e4e25363 100644 +index 629b2ad6acd573609fc85a93dc166f42fe43127a..52785737cb9f5683f5024dd828a99c88cfe7a7cf 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -@@ -128,6 +128,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { +@@ -127,6 +127,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { for (const auto& str : kStrings) AddLocalizedString(source, str.name, str.id); diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 7b535ea40f5..ad3cf9d0f1e 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -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 96a009f80e18a62566c47513b3dabe606b636d9d..d2f60e616c195d3fad5daf260acf58fe0dc837d1 100644 +index 7a96761317767357dd4bd824b02be3b7f1b80886..0cab6ee0b75e02a8536d8d71f7190212a418a377 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1101,6 +1101,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1129,6 +1129,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index e159b6ef20f..d3315a85c67 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -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 043c4dd63257da4bfa26f9364738643705217e23..d7782bbb0f5f66ca6f2eb06de5cf6b2a6a0d8230 100644 +index bc380760dcde83084ac15c503e8cfacea7798d17..18007820fb21a570e7fba51389e7e324538f1e8e 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -343,6 +343,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile, +@@ -344,6 +344,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile, } source->AddString(kLoadTimeClassesKey, GetLoadTimeClasses(in_dev_mode)); diff --git a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch index f4bb3c164c7..c1c88efea9c 100644 --- a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc -index 5eca85a0c6281dc41c63fcab5832317bf4b356d4..67a28b734195be657b17c4603f7ee0a8a05e51cb 100644 +index 7d2161fdf5e5cf56220bf316c4a8dd08338e1f4f..2bbdec2ce19edd7b29d3cb1a948ec6b2a92507a5 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc -@@ -131,6 +131,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue* args) { +@@ -130,6 +130,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue* args) { selected_items |= importer::PASSWORDS; if (*types->FindBoolKey(prefs::kImportDialogSearchEngine)) selected_items |= importer::SEARCH_ENGINES; @@ -10,7 +10,7 @@ index 5eca85a0c6281dc41c63fcab5832317bf4b356d4..67a28b734195be657b17c4603f7ee0a8 const importer::SourceProfile& source_profile = importer_list_->GetSourceProfileAt(browser_index); -@@ -209,6 +210,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) { +@@ -208,6 +209,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) { browser_profile->SetBoolean( "autofillFormData", (browser_services & importer::AUTOFILL_FORM_DATA) != 0); diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index c1bc22cc33e..3d5b4c7b909 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index eb6cf74a3c1c41a8181f812bbcbf26159a206307..d34894f5420bcae7f5369d0879385c52ca7faddb 100644 +index bea45dc90ced53eedf76ac3f572028b7f63f6263..ee69200f04831502d7d9f4d8a3569f4989632730 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc @@ -854,6 +854,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync) { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index e8e16f1a733..3aa78cc1312 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -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 f384bc355db03f53d107cdab7ab8695e76962fa8..b613a994cd046fd9a1b6bb8992a82df8f1489167 100644 +index 051c252f169c19f697634abef5ff6bdbbe8568ac..0c560f3dd4fac4e1ae2a276647b05e5ee5038125 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2555,6 +2555,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2570,6 +2570,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 948480e8593..524cf5ebdd7 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,16 +1,16 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index af39c4566688786bb0a71dbec44c1a5dd8fdb435..2b7dd3d629dd0d64419ee94337416125ff9bf464 100644 +index b495bc6568057aaed58075da3995ec08e2a043a8..f44a9e01d6a2d8661e84513f19d9d4518c45f7b4 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -149,6 +149,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { +@@ -148,6 +148,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { {ContentSettingsType::PERMISSION_AUTOREVOCATION_DATA, nullptr}, {ContentSettingsType::FILE_SYSTEM_LAST_PICKED_DIRECTORY, nullptr}, {ContentSettingsType::DISPLAY_CAPTURE, nullptr}, + BRAVE_CONTENT_SETTINGS_TYPE_GROUP_NAMES_LIST }; - // TODO(crbug.com/1149878): After removing -@@ -378,6 +379,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { + static_assert(base::size(kContentSettingsTypeGroupNames) == +@@ -375,6 +376,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { diff --git a/patches/chrome-browser-ui-webui-theme_source.cc.patch b/patches/chrome-browser-ui-webui-theme_source.cc.patch index 0b3f87b2eaf..20d1633c6a5 100644 --- a/patches/chrome-browser-ui-webui-theme_source.cc.patch +++ b/patches/chrome-browser-ui-webui-theme_source.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc -index 1386ed6ae3bf50f616bca5945295b2cd7f4fd954..1fd84e8da34fad21557277ceb014548c03242d5d 100644 +index eb9cefd96fbdb418565f94897cf403b7794d65bd..78ef457d91c2f97139c51d2deb63a07e136e5967 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -100,7 +100,7 @@ void ThemeSource::StartDataRequest( diff --git a/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch index 3edcd55e25a..6b603a2a111 100644 --- a/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm -index 383f32971a20244bdcc43dc3c5b854165f93f7ea..0820262965d59f02b529300d876a7961e65d6648 100644 +index bcf8d5ffd56ed9acbf2018a6684cc6523fb928d8..cde6c9339674872e1e5b06a93ac72f50c5acbcef 100644 --- a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm @@ -763,6 +763,7 @@ base::FilePath GetChromeAppsFolder() { diff --git a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch index 6ab7c5d3fb4..c08a95a4a5f 100644 --- a/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch +++ b/patches/chrome-browser-webauthn-chrome_authenticator_request_delegate.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -index 195c192aa77fd4abe12424c9daf0b2a2bd98db4a..6ae1267d62bc6bbb36800260c9b440ef504dc722 100644 +index 70f5626c02061e1ce325bc069854895e6558e56b..067c1fcd2ac8756d48f0e95dbd370950f78b5ef8 100644 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc @@ -482,6 +482,7 @@ std::string TouchIdMetadataSecret(Profile* profile) { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 71628022f82..dc251921e61 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index a99755c47d431245053e79324989d39dfa059e2f..06015524f4f8f5f1d4cf68af44044d85281df89e 100644 +index 36c47c8d27c2a0a2ac6528b90db647cb8720df39..93359d5a40dcbcce1cd3a2cea257f0b42219ac91 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -65,6 +65,7 @@ source_set("channel_info") { @@ -10,7 +10,7 @@ index a99755c47d431245053e79324989d39dfa059e2f..06015524f4f8f5f1d4cf68af44044d85 public_deps = [ "//base", "//components/version_info", -@@ -147,6 +148,7 @@ static_library("common") { +@@ -149,6 +150,7 @@ static_library("common") { ] public_deps = [ @@ -18,7 +18,7 @@ index a99755c47d431245053e79324989d39dfa059e2f..06015524f4f8f5f1d4cf68af44044d85 ":available_offline_content_mojom", ":buildflags", ":channel_info", -@@ -543,6 +545,7 @@ static_library("non_code_constants") { +@@ -545,6 +547,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-common-importer-importer_data_types.h.patch b/patches/chrome-common-importer-importer_data_types.h.patch index 6701deae24b..70719048355 100644 --- a/patches/chrome-common-importer-importer_data_types.h.patch +++ b/patches/chrome-common-importer-importer_data_types.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h -index ee901d48c0011f01b42cdded99f561acd65cafcf..ad044aa2e50e7922c66c3951abc65aa89692c2c9 100644 +index 7af3d7b83c5a7f9c61bbc55219989575595c1708..e3fc3d7942ce3af9d1fecaea5f22d43e88623948 100644 --- a/chrome/common/importer/importer_data_types.h +++ b/chrome/common/importer/importer_data_types.h -@@ -31,7 +31,7 @@ enum ImportItem { +@@ -30,7 +30,7 @@ enum ImportItem { SEARCH_ENGINES = 1 << 4, HOME_PAGE = 1 << 5, AUTOFILL_FORM_DATA = 1 << 6, @@ -11,7 +11,7 @@ index ee901d48c0011f01b42cdded99f561acd65cafcf..ad044aa2e50e7922c66c3951abc65aa8 }; // Information about a profile needed by an importer to do import work. -@@ -111,6 +111,7 @@ enum VisitSource { +@@ -110,6 +110,7 @@ enum VisitSource { VISIT_SOURCE_FIREFOX_IMPORTED = 1, VISIT_SOURCE_IE_IMPORTED = 2, VISIT_SOURCE_SAFARI_IMPORTED = 3, diff --git a/patches/chrome-common-importer-mock_importer_bridge.h.patch b/patches/chrome-common-importer-mock_importer_bridge.h.patch index c998162ac5d..d328bc9ae91 100644 --- a/patches/chrome-common-importer-mock_importer_bridge.h.patch +++ b/patches/chrome-common-importer-mock_importer_bridge.h.patch @@ -1,10 +1,10 @@ diff --git a/chrome/common/importer/mock_importer_bridge.h b/chrome/common/importer/mock_importer_bridge.h -index 389b98407fc66fc25a5d0bc82c2881b2298640eb..2862e2ce535904009a0c0ddab5a0ba484f6d0d1f 100644 +index c1a976cab327b105aa24054c2c248aa4a727a66b..051cd594dec3c6f4a61198263ea69996dcae944b 100644 --- a/chrome/common/importer/mock_importer_bridge.h +++ b/chrome/common/importer/mock_importer_bridge.h @@ -35,7 +35,7 @@ class MockImporterBridge : public ImporterBridge { MOCK_METHOD0(NotifyEnded, void()); - MOCK_METHOD1(GetLocalizedString, base::string16(int)); + MOCK_METHOD1(GetLocalizedString, std::u16string(int)); - private: + protected: diff --git a/patches/chrome-installer-mac-BUILD.gn.patch b/patches/chrome-installer-mac-BUILD.gn.patch index b2c7c180a4c..70103fd3999 100644 --- a/patches/chrome-installer-mac-BUILD.gn.patch +++ b/patches/chrome-installer-mac-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn -index b3fc448575b68fbde67a57040896f88fb77cf54c..22f09546d7edc2bf03679e9d2290f34c86b62b36 100644 +index 9bdc5998805853db894a381d722e19c8474d86c8..c92ac7bbc6aa256b54b47ac11926c3a088b7c4f5 100644 --- a/chrome/installer/mac/BUILD.gn +++ b/chrome/installer/mac/BUILD.gn -@@ -17,7 +17,8 @@ group("mac") { +@@ -18,7 +18,8 @@ group("mac") { public_deps = [ ":copies" ] } diff --git a/patches/chrome-installer-mac-signing-config_factory.py.patch b/patches/chrome-installer-mac-signing-config_factory.py.patch index 868a962f962..ac33088af4e 100644 --- a/patches/chrome-installer-mac-signing-config_factory.py.patch +++ b/patches/chrome-installer-mac-signing-config_factory.py.patch @@ -1,10 +1,10 @@ diff --git a/chrome/installer/mac/signing/config_factory.py b/chrome/installer/mac/signing/config_factory.py -index 0689fb6476e741b711454aeaf4ac7c20d5e4f989..c303bb474dcf4036fc1e8d8b6985af20ae2e4f62 100644 +index d4e2ce7eb5231574962e57e6e3fb8ee7115a21bf..77ab1a0f57b235e6a3765dd8bf79ee26999c6163 100644 --- a/chrome/installer/mac/signing/config_factory.py +++ b/chrome/installer/mac/signing/config_factory.py @@ -8,6 +8,8 @@ def get_class(): # First look up the processed Chromium config. - from chromium_config import ChromiumCodeSignConfig + from .chromium_config import ChromiumCodeSignConfig config_class = ChromiumCodeSignConfig + from signing_helper import GetBraveSigningConfig + config_class = GetBraveSigningConfig(config_class) diff --git a/patches/chrome-installer-mac-signing-parts.py.patch b/patches/chrome-installer-mac-signing-parts.py.patch index 644ac9c7fa3..7412a2bb3e1 100644 --- a/patches/chrome-installer-mac-signing-parts.py.patch +++ b/patches/chrome-installer-mac-signing-parts.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mac/signing/parts.py b/chrome/installer/mac/signing/parts.py -index def2456b325bb4cc25b35a44dd6069fef8293726..e637c1716a858f858d1ce83497508a92a4190ed9 100644 +index 9a20b98f19da9d35b7a87340262601ec40ec2660..cb3240b96c38460af81bc9f81c4c34dd17e67e79 100644 --- a/chrome/installer/mac/signing/parts.py +++ b/chrome/installer/mac/signing/parts.py @@ -10,6 +10,7 @@ import os.path @@ -10,7 +10,7 @@ index def2456b325bb4cc25b35a44dd6069fef8293726..e637c1716a858f858d1ce83497508a92 _PROVISIONPROFILE_EXT = '.provisionprofile' _PROVISIONPROFILE_DEST = 'embedded.provisionprofile' -@@ -132,6 +133,7 @@ def get_parts(config): +@@ -140,6 +141,7 @@ def get_parts(config): library_basename.replace('.dylib', ''), verify_options=verify_options) @@ -18,7 +18,7 @@ index def2456b325bb4cc25b35a44dd6069fef8293726..e637c1716a858f858d1ce83497508a92 return parts -@@ -195,6 +197,7 @@ def sign_chrome(paths, config, sign_framework=False): +@@ -203,6 +205,7 @@ def sign_chrome(paths, config, sign_framework=False): continue signing.sign_part(paths, config, part) diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index 97a66ac8312..b1ebc19af08 100644 --- a/patches/chrome-installer-util-shell_util.cc.patch +++ b/patches/chrome-installer-util-shell_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc -index d33b1bcb081c2fc2952455012a07d593687308b8..f31de7a11686a4eec809f9760baff92a22192425 100644 +index 581e0e6342dd8f177deefe04fd1bbda01496d7a6..502e7d3a044250bda484f9ef936f681681bdd2b1 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -746,6 +746,7 @@ std::wstring GetTargetForDefaultAppsSettings(const wchar_t* protocol) { diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 4e50452fd6d..3bd73908b19 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index a69e547cdaa14d4d8deec964648c475a12599228..c4347573f2ac783ca1298d7acf00f88b4c7c3114 100644 +index 8a69a486b5d7184e7e4680b3e5f98d6f6818b578..63c2da2ba00d8c6ce3f67722fb87b3a71d929092 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -225,6 +225,7 @@ static_library("renderer") { +@@ -228,6 +228,7 @@ static_library("renderer") { "//v8", ] diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 6273c342c36..aa116faaa61 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index b6fe493a6ddcbeec0fc56ac7976edf425f8edc07..84f8680f5dd3657638918d0a115e95e04a643c6e 100644 +index 08dda0d5779cefcc0aa2d7d691d8f84137975b5e..bcd31cd4529ecdd77ea2dabafbef90dd73657089 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -478,7 +478,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -483,7 +483,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index 3ba1ce0d1d4..20f41723155 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index 4a6fff63e13a454646e8fe3bb66c98357bbc2ba1..d5072d75547a24accc7f94b7158475581e9ce8f9 100644 +index 4fb3926576c80881a9230bb91bfe7655fec12df1..1cf767b9a63d078f47b8017710dda47498f79f3f 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h -@@ -222,6 +222,7 @@ class ChromeContentRendererClient +@@ -220,6 +220,7 @@ class ChromeContentRendererClient #endif private: diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 43b03cc69f8..e628ffc0298 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,11 +1,11 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 8428b7508092816a57510cf5f9d74d3925038cfa..b90ac9b30fb37ab641a3b71d5fb098f38469b66a 100644 +index 0c51b3af317627579e096e4aff5682ba1745b234..d1d45a5ed7ba91c6ac2e92082997c6cf939772c4 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -899,6 +899,7 @@ if (!is_android) { +@@ -904,6 +904,7 @@ if (!is_android) { "//v8", ] - + + deps += [ "//brave/test:brave_browser_tests_deps", ] # Runtime dependencies data_deps = [ diff --git a/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch b/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch index c4f3e74a9e8..edf6a2241aa 100644 --- a/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch +++ b/patches/chrome-tools-build-mac-infoplist_strings_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/tools/build/mac/infoplist_strings_util.cc b/chrome/tools/build/mac/infoplist_strings_util.cc -index 89801229291a63e69574bc13cfe563aac360012f..038a9a66222dedad219c83b06be3e53a00b70f94 100644 +index daa300cfa0bb34a92893ffaf3239675e4ce5803e..e2a49e785f3bcdc64e1b121acbfbdb4ceeddc0f7 100644 --- a/chrome/tools/build/mac/infoplist_strings_util.cc +++ b/chrome/tools/build/mac/infoplist_strings_util.cc @@ -153,6 +153,7 @@ int main(int argc, char* const argv[]) { diff --git a/patches/chrome-utility-importer-external_process_importer_bridge.h.patch b/patches/chrome-utility-importer-external_process_importer_bridge.h.patch index cb80734c49b..4a0bb243664 100644 --- a/patches/chrome-utility-importer-external_process_importer_bridge.h.patch +++ b/patches/chrome-utility-importer-external_process_importer_bridge.h.patch @@ -1,9 +1,9 @@ diff --git a/chrome/utility/importer/external_process_importer_bridge.h b/chrome/utility/importer/external_process_importer_bridge.h -index 29633eb670b7ac36f28f255c65d12c467e65bae9..1bf66a423598b474918109bf67af5dc3ba35ea4c 100644 +index a5723dc9ce4bbba5ba00f9611e6bde854aa9cc94..1674b6d9a7f815ff06c52bdbf83ebe274adc48f3 100644 --- a/chrome/utility/importer/external_process_importer_bridge.h +++ b/chrome/utility/importer/external_process_importer_bridge.h @@ -68,6 +68,7 @@ class ExternalProcessImporterBridge : public ImporterBridge { - base::string16 GetLocalizedString(int message_id) override; + std::u16string GetLocalizedString(int message_id) override; // End ImporterBridge implementation. + BRAVE_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_ diff --git a/patches/chrome-utility-services.cc.patch b/patches/chrome-utility-services.cc.patch index 10156732802..df8fddd9bc9 100644 --- a/patches/chrome-utility-services.cc.patch +++ b/patches/chrome-utility-services.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc -index ebda0b60ba128e7d4cb5c2c6abda80215cb2edb3..a67f37c060697561de8045e5509bf90d937d4593 100644 +index 6c9ea20ffe1aa6f9afba23bea30ee327616e1cd1..44eef8e6d02c7fc102b0e9e7351b13a94dd5a90d 100644 --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc @@ -395,6 +395,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { diff --git a/patches/components-bookmarks-browser-bookmark_model.h.patch b/patches/components-bookmarks-browser-bookmark_model.h.patch index fdc063d8fea..6df26440349 100644 --- a/patches/components-bookmarks-browser-bookmark_model.h.patch +++ b/patches/components-bookmarks-browser-bookmark_model.h.patch @@ -1,8 +1,8 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h -index 31eafa3895af04f04ed2106ad0038691a7e9cad2..98c4f2ebcd016d7d6a69b6da9dea8d4b6064c9af 100644 +index 33c7167f6d7adbf73f266346b82560785befce72..1b578e1332fb8c44aa06dcdafe62f415e50e72e6 100644 --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h -@@ -305,6 +305,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -304,6 +304,7 @@ class BookmarkModel : public BookmarkUndoProvider, return weak_factory_.GetWeakPtr(); } diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index 004a13d9c43..fd857a77b04 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index 8a1db9d096142efec7f400acb2fdb4aab5564cd0..ae53d00a78cc0bc8ffc7da6e3e3b5ecf1c2d3c4f 100644 +index 0aaaed50058c592d4dd5289160cbc3ce48fdcad3..d179a22007bfab63835bf24317a82f77f3c7a7ad 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -63,7 +63,7 @@ diff --git a/patches/components-component_updater-component_updater_service.h.patch b/patches/components-component_updater-component_updater_service.h.patch index ae91bcb5e59..5806fbcea5c 100644 --- a/patches/components-component_updater-component_updater_service.h.patch +++ b/patches/components-component_updater-component_updater_service.h.patch @@ -1,5 +1,5 @@ diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h -index d87906676548af1ef77303ef03cf7fc709ed2f6e..1ecf36794cc3bd1f81d6a0221c2cd8741809aab1 100644 +index b4693bbeaf5987ffad8786be2ed6c6b7c981634d..6470314aa0b1a0654c46ce5b485eb644a93753a8 100644 --- a/components/component_updater/component_updater_service.h +++ b/components/component_updater/component_updater_service.h @@ -143,6 +143,7 @@ class ComponentUpdateService { diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch index 9c645f9b5c9..57e0bd830d8 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -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 51f992cd3d168feb4670d0c9e42683d9a696b56e..aa00a147e716696a49f3581222481d9c1b5ed36a 100644 +index 42fd2d7d4acaa3081a3eecb176915074a8de6c5f..485a5faae6cde4fac15b537381ad591ae8b6f767 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc @@ -93,6 +93,7 @@ constexpr HistogramValue kHistogramValue[] = { diff --git a/patches/components-content_settings-core-common-content_settings_types.h.patch b/patches/components-content_settings-core-common-content_settings_types.h.patch index d9c58b56d0d..ea228c908ae 100644 --- a/patches/components-content_settings-core-common-content_settings_types.h.patch +++ b/patches/components-content_settings-core-common-content_settings_types.h.patch @@ -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 a7ea788112619bf5e21009aab6ca254cf2a96b44..b3b2eb28a2e27ba4e99de6b55f4f43513332d24d 100644 +index 1c12667a0c0cc688e1c8be23631d4a63e65e2c7b..62042cb9deff7e587bf944f8257ea489ec4c7abb 100644 --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -237,6 +237,7 @@ enum class ContentSettingsType : int32_t { +@@ -236,6 +236,7 @@ enum class ContentSettingsType : int32_t { // register the PermissionContext. DISPLAY_CAPTURE, diff --git a/patches/components-external_intents-android-BUILD.gn.patch b/patches/components-external_intents-android-BUILD.gn.patch index a6a9d8e6294..1927858f6b9 100644 --- a/patches/components-external_intents-android-BUILD.gn.patch +++ b/patches/components-external_intents-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/external_intents/android/BUILD.gn b/components/external_intents/android/BUILD.gn -index 4eac51b0811d9632099dafb3fa5d2c09a685bb26..a1701dba5a49897aa8ff568b52c7dce3d1d3796c 100644 +index e58881ccbd96e59027a23bc69b95a178f82dfc24..7cf4e5dec57af518d3ed17e91f90031daf3bf1b1 100644 --- a/components/external_intents/android/BUILD.gn +++ b/components/external_intents/android/BUILD.gn @@ -64,6 +64,7 @@ static_library("android") { diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 8595e81e58d..2ef13809ab8 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,8 +1,8 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 9bb64d71d785495badce4e476f0d2bece23c98af..c31f42169937edefafddde522e4ca1f12c12c332 100644 +index 8dc11eff44611e835d1dbdb46b12dcf9cf5b735c..063a9c752a0ec08fd8ee480d7ef9157ed82b1172 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h -@@ -51,6 +51,8 @@ enum VisitSource { +@@ -50,6 +50,8 @@ enum VisitSource { SOURCE_FIREFOX_IMPORTED = 3, SOURCE_IE_IMPORTED = 4, SOURCE_SAFARI_IMPORTED = 5, diff --git a/patches/components-infobars-core-infobar_delegate.h.patch b/patches/components-infobars-core-infobar_delegate.h.patch index 7e716078f75..daa361eb9a4 100644 --- a/patches/components-infobars-core-infobar_delegate.h.patch +++ b/patches/components-infobars-core-infobar_delegate.h.patch @@ -1,11 +1,11 @@ diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h -index 98922a3e36f5cf2b88a470dd163571fa52681408..2a2ba2d552235d8876a520d91f7f2a3554907ea6 100644 +index db006b910b129783c6d0798a6e94c9a6127e336b..30fff487e74dffa11cd996631ae78c7c0e94bc15 100644 --- a/components/infobars/core/infobar_delegate.h +++ b/components/infobars/core/infobar_delegate.h -@@ -173,6 +173,7 @@ class InfoBarDelegate { - ROSETTA_REQUIRED_INFOBAR_DELEGATE = 103, +@@ -175,6 +175,7 @@ class InfoBarDelegate { // Removed: WEBID_PERMISSION_INFOBAR_DELEGATE = 104, AUTOFILL_OFFER_NOTIFICATION_INFOBAR_DELEGATE = 105, + AUTOFILL_ADDRESS_PROFILE_INFOBAR_DELEGATE_IOS = 106, + BRAVE_INFOBAR_DELEGATE_IDENTIFIERS }; diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index 416bdf9d661..0eac7984a5e 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index f58b75e275e59424701196d35842be33a0261ea1..91d5d888b277672df2ec0c5c2dc5989b82a8f4cc 100644 +index af31f06a1b74f2da62a3b2bbdbdddb5cca36a09f..ae0c3d5c429dca7ae51b90654c5a6bce673e224b 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -289,6 +289,7 @@ AutocompleteController::AutocompleteController( diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 946ab90bcd3..2f5448a899e 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 1ab498c0401157ade690c4a57976bf5e0483b797..3f22d221eb5028ffb58f34e8b7d817c2be999e22 100644 +index f40c34f809349d24a757b75c2eea8f6f3b95d729..fe20bb26e16c16a1442a9e2a48e3a7620432f9cb 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -354,6 +354,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, +@@ -355,6 +355,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, (*text == display_text_ || *text == url_for_editing_)) { *url_from_text = controller()->GetLocationBarModel()->GetURL(); *write_url = true; diff --git a/patches/components-os_crypt-os_crypt_win.cc.patch b/patches/components-os_crypt-os_crypt_win.cc.patch index b806e29ec2d..1532fb16858 100644 --- a/patches/components-os_crypt-os_crypt_win.cc.patch +++ b/patches/components-os_crypt-os_crypt_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/os_crypt/os_crypt_win.cc b/components/os_crypt/os_crypt_win.cc -index 42753a38a61bf748189b9a50d1594f95ae981303..ff4bb76e0d8c17cb4fe94262a16599548be752be 100644 +index 51433a89264cb10ed6d19a96afbf228358afd6d0..f67c5511b6c0369e633ff4fcdd06f434b177431a 100644 --- a/components/os_crypt/os_crypt_win.cc +++ b/components/os_crypt/os_crypt_win.cc @@ -135,6 +135,7 @@ bool OSCrypt::DecryptString16(const std::string& ciphertext, diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index d21b49a896b..94dc91d3d23 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index ecb23f38f28cf897404f9d458f46e414372ff8a2..234a8a5d04e76c57fbf1293ae5cea81b86d2bad3 100644 +index 1cc43c8b95d8448b69604cc1b33a3863db3bfe03..61961f550c744690b4bf363667296c930b16d0d6 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -960,6 +960,7 @@ void PageInfo::PresentSitePermissions() { +@@ -938,6 +938,7 @@ void PageInfo::PresentSitePermissions() { } } diff --git a/patches/components-page_info-page_info_ui.cc.patch b/patches/components-page_info-page_info_ui.cc.patch index 806cc02a06f..69ea02d53be 100644 --- a/patches/components-page_info-page_info_ui.cc.patch +++ b/patches/components-page_info-page_info_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc -index ddf881ff86b9b6f270fd449303a528a978a3895f..5607be9b6a01ceb2f7837cd0ba4e260a71336c44 100644 +index e4947bde8d983dcc3bd65c46f473d96b5c008ab3..d6d31b359f2657dddbc9862004f6c140d8e9d695 100644 --- a/components/page_info/page_info_ui.cc +++ b/components/page_info/page_info_ui.cc @@ -652,6 +652,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon( diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index d558d0358a7..f3cf3adf758 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index b3e09a03bd947242297b22c80a1a99d7f477a0d0..14c69ba5495e9e15e29d8d62b799b74b2c24e230 100644 +index 17d89c404f0c0a05fdca2f4b10d01f2438616391..071a107a7d68a8c02932df82350c303e02625bed 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc @@ -2030,6 +2030,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( diff --git a/patches/components-password_manager-core-browser-password_form_filling.cc.patch b/patches/components-password_manager-core-browser-password_form_filling.cc.patch index a9978d2594a..4fb1e3bf990 100644 --- a/patches/components-password_manager-core-browser-password_form_filling.cc.patch +++ b/patches/components-password_manager-core-browser-password_form_filling.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index b6d5e1912cf6856241e37b2f704809788d49edc8..9d9fb34f4dfbd29dcb2c109734732489b5cb7ca4 100644 +index 2dbd33ea68cb6811f45ac479f9b5a7129c5826fb..3151bd3d38c6cf4d31d2fcfa740a08ec1f0040e6 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc -@@ -228,6 +228,7 @@ LikelyFormFilling SendFillInformationToRenderer( +@@ -224,6 +224,7 @@ LikelyFormFilling SendFillInformationToRenderer( bool wait_for_username = wait_for_username_reason != WaitForUsernameReason::kDontWait; diff --git a/patches/components-strings-BUILD.gn.patch b/patches/components-strings-BUILD.gn.patch index 804e8087dc7..c1c70fdf5ca 100644 --- a/patches/components-strings-BUILD.gn.patch +++ b/patches/components-strings-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn -index 15bf6b003892f39d4946ccfad7d630db19751d1b..5988642823db876c86f71168b396aa25cb51e7c3 100644 +index 973ae603889b8f7077618aa4720dd0eac48b31ab..20be1adb27cde782426ff9970f5746b82661c61a 100644 --- a/components/strings/BUILD.gn +++ b/components/strings/BUILD.gn @@ -44,6 +44,7 @@ grit("components_strings") { @@ -17,5 +17,5 @@ index 15bf6b003892f39d4946ccfad7d630db19751d1b..5988642823db876c86f71168b396aa25 - source = "../components_chromium_strings.grd" + source = "../components_${branding_path_component}_strings.grd" outputs = [ "grit/components_chromium_strings.h" ] - foreach(locale, locales_with_fake_bidi) { + foreach(locale, locales_with_pseudolocales) { outputs += [ "components_chromium_strings_$locale.pak" ] diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch index 88131096504..8fbb5c1c228 100644 --- a/patches/components-sync-driver-BUILD.gn.patch +++ b/patches/components-sync-driver-BUILD.gn.patch @@ -1,12 +1,12 @@ diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn -index 1171a23a85e2e4b1138bccfe5900e76e7c75f95d..86832f953d575ba8ecd54b9d662feea6679b84d5 100644 +index 2d0822486c2676110fbbb9ca098f81eacdf5f6fe..0286ade512b4a079dc5d7629e55c3510802cb691 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn -@@ -114,6 +114,7 @@ static_library("driver") { +@@ -113,6 +113,7 @@ static_library("driver") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] + sources += brave_components_sync_driver_sources deps += brave_components_sync_driver_deps defines = brave_service_key_defines } - grit("resources") { + static_library("test_support") { diff --git a/patches/components-sync-driver-profile_sync_service.h.patch b/patches/components-sync-driver-profile_sync_service.h.patch index c0294f43950..dc31b796e7c 100644 --- a/patches/components-sync-driver-profile_sync_service.h.patch +++ b/patches/components-sync-driver-profile_sync_service.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h -index 5ba05a7aebc8fb3e1b6e48843e9e44a460e7a780..c3e9c766de71caefd9734778b6ab4fc4772d5566 100644 +index f914eac83acdb69fe6f15864e0f1c20f91006b90..332a6477d10c4394302a04b16930c17819e5cb12 100644 --- a/components/sync/driver/profile_sync_service.h +++ b/components/sync/driver/profile_sync_service.h -@@ -247,6 +247,7 @@ class ProfileSyncService : public SyncService, +@@ -249,6 +249,7 @@ class ProfileSyncService : public SyncService, SyncClient* GetSyncClientForTest(); diff --git a/patches/components-sync-engine-BUILD.gn.patch b/patches/components-sync-engine-BUILD.gn.patch index 990e4f5fe73..4d3b7631cee 100644 --- a/patches/components-sync-engine-BUILD.gn.patch +++ b/patches/components-sync-engine-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/engine/BUILD.gn b/components/sync/engine/BUILD.gn -index 9fd0e5fab5f580fd28c12cf8ff4dc2025fcc8a9c..c4bf15915a00f26f35a0e56063295288eb252f51 100644 +index ee0ea0e192723fc176f231836c0062cfd444ddea..509dab2a06ddadb0441c6d31c71f287665da2e14 100644 --- a/components/sync/engine/BUILD.gn +++ b/components/sync/engine/BUILD.gn @@ -162,6 +162,7 @@ static_library("engine") { diff --git a/patches/components-sync-engine-model_type_worker.h.patch b/patches/components-sync-engine-model_type_worker.h.patch index 9bec6fd767b..1b4749c3d48 100644 --- a/patches/components-sync-engine-model_type_worker.h.patch +++ b/patches/components-sync-engine-model_type_worker.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/model_type_worker.h b/components/sync/engine/model_type_worker.h -index 549122b3ea45468ed2eb5f97bdedf5a7c1e230e6..872982146113613ca8c1128eff6cdd751bb256ff 100644 +index e14a3bdcb4bfe4efd627a98d8861aceb0de4ee63..d42a3cfae10d9a9d8c2b34ed7f92e6c94295d17e 100644 --- a/components/sync/engine/model_type_worker.h +++ b/components/sync/engine/model_type_worker.h -@@ -128,6 +128,7 @@ class ModelTypeWorker : public UpdateHandler, +@@ -141,6 +141,7 @@ class ModelTypeWorker : public UpdateHandler, min_gu_responses_to_ignore_key_ = min_gu_responses_to_ignore_key; } diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 74859c16143..8e9bd36dac2 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 97aec741f705de04cf01fac98b515beb677933e6..51b165844fc3ce8dfb5188b06062f5bc11501cb9 100644 +index 3f8a030ca5e25efa8a4a0980939d6aa200c4e2db..90a65ca3f98f71c509768207cbd17b52a364442b 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -379,6 +379,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -370,6 +370,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 97aec741f705de04cf01fac98b515beb677933e6..51b165844fc3ce8dfb5188b06062f5bc VISIT(sharing_fields); VISIT(invalidation_fields); } -@@ -386,7 +387,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -377,7 +378,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(send_tab_to_self_receiving_enabled); } diff --git a/patches/components-update_client-updater_state_win.cc.patch b/patches/components-update_client-updater_state_win.cc.patch index dfdc0ce9f7d..6bfbe68ec16 100644 --- a/patches/components-update_client-updater_state_win.cc.patch +++ b/patches/components-update_client-updater_state_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/update_client/updater_state_win.cc b/components/update_client/updater_state_win.cc -index 565073acfa1b1bfc09d18e0b88dba67b5d1714fe..152442fabbfe14474aef6f023ed33769f51a87c3 100644 +index 102029a0fe62122f761c4703a15483641caa38c1..61e7fcdf0767b4b5eb9a933912dbf3eb8dbf56b8 100644 --- a/components/update_client/updater_state_win.cc +++ b/components/update_client/updater_state_win.cc -@@ -25,20 +25,32 @@ namespace { +@@ -24,20 +24,32 @@ namespace { // Google Update group policy settings. const wchar_t kGoogleUpdatePoliciesKey[] = diff --git a/patches/content-browser-browser_main_runner_impl.cc.patch b/patches/content-browser-browser_main_runner_impl.cc.patch index 5d17351e9c3..5bf227e2edc 100644 --- a/patches/content-browser-browser_main_runner_impl.cc.patch +++ b/patches/content-browser-browser_main_runner_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/browser_main_runner_impl.cc b/content/browser/browser_main_runner_impl.cc -index 986c41e2f51e20240ccf240e1213a63f13f93677..a7a92e8f36d3fcf22f0937b57a4cf551b7235eda 100644 +index efda461212d08e1a3d766021d321e3dbbccb4669..aeb506f0fee13a335e1b0825a71f3e607c328497 100644 --- a/content/browser/browser_main_runner_impl.cc +++ b/content/browser/browser_main_runner_impl.cc @@ -16,6 +16,7 @@ diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 5083d2e0625..2b025f88688 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -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 b2b48bda88f7f67e4cd90b0f2e1e22a5e07c6a73..6e2b606e187518f331e4d22ac0ca9d8704718bed 100644 +index e511420c4fdf384a5903824e310eb510a5bec2a2..4513bca34c5eed0b3f3cf5e0252e56e297089d5f 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3062,16 +3062,17 @@ void NavigationControllerImpl::NavigateWithoutEntry( +@@ -3079,16 +3079,17 @@ void 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. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 15351adf4de..b141ba93755 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index ec741e3bdb5041c525d30e6c3b16ab9a0a4a607a..41b4d8f1ed8a54fae3f3b658122e5ff41d2a8a14 100644 +index 6425cd2197aed8ff8b3a905ed5f6d38d92a27df7..93c760438603c04d73d0e0c6b866e05aff63286d 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2041,6 +2041,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2062,6 +2062,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 ec741e3bdb5041c525d30e6c3b16ab9a0a4a607a..41b4d8f1ed8a54fae3f3b658122e5ff4 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -3095,6 +3096,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -3112,6 +3113,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch index 567f585326e..b203592b2d9 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index 59d9e46f21cecff772d6c8fa50ed6bca1f2b6ed1..9d98d69a1e3cc41ef5af3ca1fdbb2007b41c4c01 100644 +index 2350d783af164cbf7c6bb0e119e13385169a29fa..cc0e0434204a54830c113e638442605db4c09fd3 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc @@ -69,6 +69,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHostImpl* frame_host) diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 0b967ae8a6c..9a44a5e3b53 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 2ebbb4249c613924611531043fbad76e790ad01b..f676a13a02e76b0f1cb9809fdbdfc59d9a4042cf 100644 +index 5a2f2c707f21025f246ceec7f8fbda7715d1b7d7..6d7b2a53ff703a3352d2014d950703cba55f0426 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -42,6 +42,7 @@ source_set("common") { diff --git a/patches/content-public-browser-browser_main_parts.h.patch b/patches/content-public-browser-browser_main_parts.h.patch index 8036f2d8e45..214b46078a3 100644 --- a/patches/content-public-browser-browser_main_parts.h.patch +++ b/patches/content-public-browser-browser_main_parts.h.patch @@ -1,10 +1,10 @@ diff --git a/content/public/browser/browser_main_parts.h b/content/public/browser/browser_main_parts.h -index 2bfefad46b9ef071a9bafebe03550238c0acfad4..1c3a7a299e65457fa66070e0f94efb05e5222442 100644 +index f888a865df81851c9940ee89281432bdc3e5281b..a35f53ee654bb1fc21dbfe6d65ee6de94fe3048c 100644 --- a/content/public/browser/browser_main_parts.h +++ b/content/public/browser/browser_main_parts.h -@@ -99,6 +99,9 @@ class CONTENT_EXPORT BrowserMainParts { - // Called as the very last part of shutdown, after threads have been - // stopped and destroyed. +@@ -135,6 +135,9 @@ class CONTENT_EXPORT BrowserMainParts { + + virtual void PostMainMessageLoopRun() {} virtual void PostDestroyThreads() {} + + // Called when shutdown is about to begin. diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 6077f4396e6..fc36b1c8969 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 944f98d0f979942561eb81115437c5d951a9e7d7..5c46ea94a1a8e0cd145b9f8e715e43b24b136db2 100644 +index fedf85bfac89c9372b0fd48e908b1c73da92c0ee..dc1e1f4a925031f0c58675fb9d4d96c3976c2b39 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1831,6 +1831,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1830,6 +1830,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index c3cc17f868d..899f267920b 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 3938fee54a05d7fd45b3afc20ea24d67be03c14f..3626c8bfa396c475a61ba2b02183ee589023e97c 100644 +index e24fe5b792f5c0ee3f86946ee96e9f6e72f16488..83404e1ff21caf3a9d84eae0e468c6daeafeb1f6 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4641,7 +4641,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4647,7 +4647,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (render_view_->GetWebView()->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index e82ab6af89b..ac73cb99b31 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index ebc8e70064539c56293708dbf1cee5c2d4e508e7..3479305580b42b4bd61fe1f4d3463e3bad558c3c 100644 +index cac1c3290fb78457057f0e557ca35b49719c8bbd..6a3f395a6a07c77efb09151d70c4fc48f772c6ab 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) { +@@ -963,6 +963,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index b6e648fc781..1376af874da 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index a0507b8e1b5ce6e66a32c4957204b5ed91c428e9..02f0934c329e8101e70142a8981980395d79edd5 100644 +index ca28d75b9921f05ec084442cee1966aa7ac8205c..69c48be10fb8acd172beef4621e9bb0b76236ff3 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1304,6 +1304,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1308,6 +1308,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch index 5f5e05751db..654b3f1631c 100644 --- a/patches/extensions-browser-sandboxed_unpacker.cc.patch +++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch @@ -1,5 +1,5 @@ diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc -index 64bb682db2b892c5425eda43f82262279dac5749..8d1c8f83a7f5d90f0c717bcacdaa2f55d228c534 100644 +index 883d111eb54ce595307609096da56c3254118327..650a55962cc807ee5ea8a39b8eedb850a8e6bb8b 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc @@ -996,6 +996,7 @@ base::Optional SandboxedUnpacker::RewriteManifestFile( diff --git a/patches/extensions-browser-user_script_manager.h.patch b/patches/extensions-browser-user_script_manager.h.patch index 116a5325fb3..72012eed7b6 100644 --- a/patches/extensions-browser-user_script_manager.h.patch +++ b/patches/extensions-browser-user_script_manager.h.patch @@ -1,5 +1,5 @@ diff --git a/extensions/browser/user_script_manager.h b/extensions/browser/user_script_manager.h -index aa6510c99e26c0700629c9f3e6c368cc742825fe..420e21f580750dff79a017146784c6eb9d21ed71 100644 +index 90445fe1bc018a089c8a7841bd85771af7154dd7..c24d736150f3ae716998400c534d395a93138cd6 100644 --- a/extensions/browser/user_script_manager.h +++ b/extensions/browser/user_script_manager.h @@ -22,7 +22,7 @@ diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch index 5095c75d7d9..14bcfc5154c 100644 --- a/patches/extensions-common-api-_api_features.json.patch +++ b/patches/extensions-common-api-_api_features.json.patch @@ -1,8 +1,8 @@ diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index 7dea7a751bef773ff76690959480c87f443c1b50..0c61bb31f03adf6b40f5526d648bfc1aab2e736f 100644 +index 44e1cc88d5e1e7d762ee66a770b2d56267fa6b51..be9baef887caa8120f72f526254c2bd3870e9500 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json -@@ -523,6 +523,7 @@ +@@ -522,6 +522,7 @@ "contexts": ["webui"], "matches": [ "chrome://password-change/*" diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 22ca3c36ebe..e82379589e4 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 216ed593daed15660ee400228f1386ddb6c8d880..b92633f275bf606270c78d692d8f80ad95863661 100644 +index d3bed2a4ff9547fc092453ba2c6a8e1a51c8a503..0b0924757c46e292355985b218d60dd3088eb386 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1165,6 +1165,7 @@ component("net") { +@@ -1167,6 +1167,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index e2ba0b4be28..c0861106b8e 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index 9168c32f3c154216af159435b668db5b61114823..602e16a7a5c28a9f1dc3e87e2fff31cfa09ce1a4 100644 +index 8af2c1b14b443ef76fd59ad5f78152d80fadc2f8..2fdea507b8168231fb3082ab7db5ccdb57fbeb31 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -434,6 +434,7 @@ std::unique_ptr CanonicalCookie::Create( +@@ -451,6 +451,7 @@ std::unique_ptr CanonicalCookie::Create( // Get the port, this will get a default value if a port isn't provided. int source_port = url.EffectiveIntPort(); diff --git a/patches/net-dns-dns_transaction.cc.patch b/patches/net-dns-dns_transaction.cc.patch index db1e6f6f25a..7b122fefd5d 100644 --- a/patches/net-dns-dns_transaction.cc.patch +++ b/patches/net-dns-dns_transaction.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc -index 9bfd4cace384ca502716efa191eaa6ccfd6a54a8..9123e8cb94b566ef1a25cbc498dfc859e4165e73 100644 +index 7d48e24ac5d077cb2209cbce7242db0a6c4b163b..9f3d3c6b185df0dbfd9df434ed980d11ad1f6259 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -1299,6 +1299,7 @@ class DnsTransactionImpl : public DnsTransaction, +@@ -1301,6 +1301,7 @@ class DnsTransactionImpl : public DnsTransaction, DCHECK(secure_); size_t doh_server_index = dns_server_iterator_->GetNextAttemptIndex(); diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index 44afece85e9..8d9468e17bf 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index f03e8049ec7150fd7863f98e2c1155bf81886b0e..fcf881231ee75475bc9b0d0a2085e28e0ed617ee 100644 +index 8a1639ddab8c0da0b66392204996bd9c629c1b17..622b9f1a23269ad6c4ff8cc235d9302e50f882eb 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -755,6 +755,7 @@ ResultCode LaunchWithoutSandbox( +@@ -754,6 +754,7 @@ ResultCode LaunchWithoutSandbox( base::Process* process) { base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 894401fccb8..94ac552b393 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index 1e3bd0ffecc9e1b55c70191ca82c523d2768c351..cf3dc60950261130c37b4990cd604069c537bdf4 100644 +index ea07962de98608b995f0b396ad10b3c5134b8311..5b09ee50b72f8328c7cf588780c94535a804d697 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -153,6 +153,7 @@ component("cpp") { +@@ -156,6 +156,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/services-network-restricted_cookie_manager.cc.patch b/patches/services-network-restricted_cookie_manager.cc.patch index 82dd25770a2..da1956f7418 100644 --- a/patches/services-network-restricted_cookie_manager.cc.patch +++ b/patches/services-network-restricted_cookie_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc -index 1515a8afc5a484eba739f500822367dc9bff4381..1b25a1295eff95118aba0d3704220cee0c79b933 100644 +index ffb0917395b7f0dc99ef6f08182482a18a36471b..08adb6f7b76e4dee3a2c8b268e144c36c1c092c2 100644 --- a/services/network/restricted_cookie_manager.cc +++ b/services/network/restricted_cookie_manager.cc -@@ -281,6 +281,7 @@ void RestrictedCookieManager::GetAllForUrl( +@@ -279,6 +279,7 @@ void RestrictedCookieManager::GetAllForUrl( // removing deprecation warnings. net_options.set_return_excluded_cookies(); @@ -10,7 +10,7 @@ index 1515a8afc5a484eba739f500822367dc9bff4381..1b25a1295eff95118aba0d3704220cee cookie_store_->GetCookieListWithOptionsAsync( url, net_options, base::BindOnce(&RestrictedCookieManager::CookieListToGetAllForUrlCallback, -@@ -432,6 +433,7 @@ void RestrictedCookieManager::SetCanonicalCookie( +@@ -430,6 +431,7 @@ void RestrictedCookieManager::SetCanonicalCookie( role_, url, site_for_cookies, isolation_info_, cookie_settings(), cookie_store_->cookie_access_delegate()); diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch index 10ddd6df112..8e797e92e7c 100644 --- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch +++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc -index 9ca4772b70486dae09089e43a9ac3ca40a4e035f..033320a8498b9fdd5cdbac361c51abd772f24d79 100644 +index 06b3138bfcd167651c01b2782e1a4df7f411f297..cd913c6e36fea67b1da5c8a9695129b600c65457 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc @@ -127,6 +127,7 @@ base::Optional> FilterAcceptCH( diff --git a/patches/third_party-blink-renderer-BUILD.gn.patch b/patches/third_party-blink-renderer-BUILD.gn.patch index e6bcfc45916..f3f1eb71e18 100644 --- a/patches/third_party-blink-renderer-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/BUILD.gn b/third_party/blink/renderer/BUILD.gn -index 02ee0bfd103ed5c42d24c7bd349a92fff0abb2af..39e1e903c332af9edaf471754843d8b15cbbab25 100644 +index b06bf2b8e10772c0d9cbad71b8690f538dc82bcf..ba5b499f2050f6c60431cd813a95d408b2baee97 100644 --- a/third_party/blink/renderer/BUILD.gn +++ b/third_party/blink/renderer/BUILD.gn @@ -9,6 +9,7 @@ if (is_clang) { diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index 65c6c5d975d..b17b08575b8 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -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 46763abf4694f015b451c98a216e52a0abff2e64..3c5c6f6aae95955522e8dbb09fff20529139bbb7 100644 +index 1194b55435e0d64d9de17eb7a8ef1c5dd93ff678..86ae2b2b6c7fddbc4076ebfa8dd004bc9a302752 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2346,6 +2346,7 @@ generated_interface_sources_in_modules = [ +@@ -2369,6 +2369,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", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 2e4c76d30e0..816f3de5a6b 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -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 a5cd50fec1c1d7949ba9958c48bec0dd8073f9c3..8d7c9a3ed3e681f5a6e85eb13c0818f35280ef2d 100644 +index 8d9d4c18117b359c743a57a3aeb50e79fc40ff0f..a53f39c42f30cb333fcd0faed856e0a461fac13e 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1090,6 +1090,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1099,6 +1099,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl", ], "abspath") diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index c7c54a86e2d..6f74ef33cc2 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index fef22a645f64c74aa168116a7c67cf9316b5dda6..96b3a2acde85d63fbfe655d0de9ef82c93288dfc 100644 +index bd6c8b5de1fbe5914f7b30999f5d449e4ef6fc56..c43dbf3744e4f015a65d10a12d0af2cb6245712c 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -172,6 +172,7 @@ component("core") { +@@ -175,6 +175,7 @@ component("core") { visibility = [] # Allow re-assignment of list. visibility = [ "//third_party/blink/*" ] @@ -10,7 +10,7 @@ index fef22a645f64c74aa168116a7c67cf9316b5dda6..96b3a2acde85d63fbfe655d0de9ef82c sources = [ "core_initializer.cc", -@@ -270,6 +271,7 @@ component("core") { +@@ -279,6 +280,7 @@ component("core") { "//v8", ] diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 5322545558b..95f489af007 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -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 1e3ed7bc5c696a72592663e5a49eb6889577d74e..195b09283d1139a49197ab6a31acd5cc91304e97 100644 +index dab957a0ad9ff2970af21bcd4a674d30820fe1d5..bbcfdc9327750c3bb7278a01496bd4b1479e49e9 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 -@@ -967,6 +967,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -944,6 +944,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch index 8c7ba5b4bb9..f1f15df329e 100644 --- a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch +++ b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch @@ -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 c5aaff6418f48f15ff10e51d8aab0d169391f7d9..5d2ba3645ade487ae97951618a1f324d3ff95738 100644 +index 358342f46b1c464979e0fb187c2be373a735ee5c..9317b84545b648b54b92ee019f5e8a74a3baeb2e 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) { diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index f7588697577..724870c52de 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index f9f35f747e7ab3644409c27cdb0c9842b57e407a..138132a092401b1e5b48b752e8d3284a36b98bd6 100644 +index d31ccd7c8ad274169f6df381970a8599d9264d3e..70f6461a3b11c2f6849f8632d099aa9530eff427 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -17,6 +17,7 @@ if (is_android) { diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index bee1cbbc453..834456c3807 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -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 98b485c0911552699cfbdf187501b08c52dc623a..f47f15028bcf1f5bbbe06b6d43910b8b3ce3e7a3 100644 +index 82ac57cc435f1c9a431e92ed38b0527d4ed1c2fd..f64d86b946efaf58e30fe74c2bd4d588c61aa5ba 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 -@@ -1822,6 +1822,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1826,6 +1826,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 98b485c0911552699cfbdf187501b08c52dc623a..f47f15028bcf1f5bbbe06b6d43910b8b int sx, int sy, int sw, -@@ -2005,6 +2006,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2009,6 +2010,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( default: NOTREACHED(); } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index 3377c39bfdc..af502f83424 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -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 b3ef16c347ace4e265afa6a351f10ff6a6d85b53..f98d48e87d2f3d811cb7056995863cb0518b6801 100644 +index ffb1c3452b4ccb90d317895764da99f7492a0a2e..28d559f8246cde7032d955af246e04a8a6a0f3e1 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 -@@ -953,6 +953,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -961,6 +961,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch index 89ad547ea34..c41f8bfdfe0 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -index f2ea9e5ee4c3fca28619efdc54ec92f52c9a8399..1fc1e68c97956d54ab6efe6fa255aacd4465a82f 100644 +index ccf4ca8d1968ca2e20c3cf045189401556d79a43..5136ab1370a44285eb48ae167ff6f5abc9bc33d8 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl @@ -118,9 +118,13 @@ interface CanvasRenderingContext2D { diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch index 432c6892abb..558f5e28f08 100644 --- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -index 50727f9025cc153d5df85c0727c905590fe048f8..d5ee10196f7987e13d863d8b61b33dca25f795a0 100644 +index 42b99e743327f984ad1455f74c7d0f445f36eee5..a6d9c9de4e09b3de90f44983aae1bc54e346e6b5 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl @@ -76,10 +76,10 @@ diff --git a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch index 31db7ca5af8..6d28c6264d4 100644 --- a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl -index 6e4ef60d87deadcd467dd21fa3a3366eae0662a1..b27881231965b4131a9e998d3649094df6269d78 100644 +index ef93f594c46acce92bbbb45d0f53078985c7252c..1db0cc63a927702da8cde4c8b630b8e5c0bbbcf0 100644 --- a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl @@ -69,10 +69,10 @@ diff --git a/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch b/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch index 7226975ae8b..9478b0f60e1 100644 --- a/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch +++ b/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc b/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc -index d2672bed59b185b0b81c17f8acb1ab24ba9f72ae..fbf68f79dc02dfc65e63c334aff92960c8f27cce 100644 +index 678065414188e5c371db7576ee6a5e241fbaa2fd..fc7e13326c861dcdb5d888555f2d171960839507 100644 --- a/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc +++ b/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc @@ -173,6 +173,7 @@ ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess( diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 4c2acc7129e..6fc563f1684 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 821de11ab6a7ff7893cce116f327f2e52f01f160..dcdc50648f5660e60c203db3e01b686a24761112 100644 +index ff0c464ba4df27fb0cc0ecbf9df0bba4dc834646..5b85c2950d6e2a4a97371231f899504268d3df17 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc @@ -414,6 +414,8 @@ void MediaDevices::DevicesEnumerated( diff --git a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch index fdd29ab1596..da0fbcb1a51 100644 --- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch +++ b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni -index 2f3b9289edf203980e8ae8dfa73398935c7b1f71..d1faf40800eee61233ddd6801ab76741aceafa77 100644 +index ea5f34fbc6fad9705c3f896714675f981445c9de..9d05afe7d940a00e34f863366d2254f95c3f148e 100644 --- a/third_party/blink/renderer/modules/modules_idl_files.gni +++ b/third_party/blink/renderer/modules/modules_idl_files.gni @@ -151,6 +151,7 @@ if (!is_android) { diff --git a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch index 88b52160c30..738daeca6b7 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc -index b11a828870692b31a029231499c1bf3df4f3ef42..c8801853042e3f90a6032d8aa2c08e4e137a00c4 100644 +index 059a80ed7ab5c4851a7cc5f5f943e752dcfaff90..beb190bec044b030683bbd1d133e8887ec2701fa 100644 --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc @@ -197,6 +197,7 @@ void RealtimeAnalyser::ConvertFloatToDb(DOMFloat32Array* destination_array) { diff --git a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.h.patch b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.h.patch index e3c83c5cafe..82e1c2dfc01 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.h.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.h.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.h b/third_party/blink/renderer/modules/webaudio/realtime_analyser.h -index 6a36b17a72459f280b3d3a6bbf099d8f1529dbb1..516c08b4cdcd227593e5fa23270376d40c46ab24 100644 +index 21d0b1fad8b2390b16c68d7256712a06f5532465..ea9fb46c118af5425db73035ecbdef4ee1591956 100644 --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.h +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.h @@ -75,6 +75,7 @@ class RealtimeAnalyser final { diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index b0db47897d2..7f5f244e8e5 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ 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 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d72070acefdc 100644 +index e9c0ef53ba29f8197f3264000ddffc253e83f944..fd052505db3dbf5dc11e6badaaf5bf6e0c73322d 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 -@@ -2900,6 +2900,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2904,6 +2904,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2931,6 +2932,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2935,6 +2936,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -2961,6 +2963,7 @@ base::Optional>> +@@ -2965,6 +2967,7 @@ base::Optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return base::nullopt; @@ -26,7 +26,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -2975,6 +2978,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -2979,6 +2982,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3008,6 +3012,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3012,6 +3016,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3144,6 +3149,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3148,6 +3153,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3545,6 +3551,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3549,6 +3555,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3560,6 +3567,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3564,6 +3571,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3652,6 +3660,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3656,6 +3664,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3707,6 +3716,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3711,6 +3720,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3717,6 +3727,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3721,6 +3731,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3768,6 +3779,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3772,6 +3783,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3799,6 +3811,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3803,6 +3815,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3829,6 +3842,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3833,6 +3846,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3841,6 +3855,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3845,6 +3859,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 return EnsureNotNull(shader->Source()); } -@@ -3848,6 +3863,7 @@ base::Optional> +@@ -3852,6 +3867,7 @@ base::Optional> WebGLRenderingContextBase::getSupportedExtensions() { if (isContextLost()) return base::nullopt; @@ -130,7 +130,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 Vector result; -@@ -3870,6 +3886,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3874,6 +3890,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3904,6 +3921,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3908,6 +3925,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -146,7 +146,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4163,6 +4181,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4167,6 +4185,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -154,7 +154,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4187,6 +4206,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4191,6 +4210,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -162,7 +162,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4264,6 +4284,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4268,6 +4288,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -170,7 +170,7 @@ index 9dd34d18b005e7d554cd28c63e013f05cb8ec830..cb86b87f223ff3b3b6a69aba0f77d720 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4611,6 +4632,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4615,6 +4636,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 11d90eed5d1..470a8eb2a61 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index c9e9d621c7304bf8abad7f877a06a5475bd6251b..0964f788f1ca649fedb3624ff84194da5265f845 100644 +index 365d4290650e4400a362d72397d634f4747d9429..5c046dfa78d886282a12e609a7cea180ce9363fa 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index c9e9d621c7304bf8abad7f877a06a5475bd6251b..0964f788f1ca649fedb3624ff84194da "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -434,6 +437,9 @@ +@@ -456,6 +459,9 @@ "META": {"align": 100}, "messages": [2700], }, diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch index 8b9d3fdb6c8..2a484aaaadc 100644 --- a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -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 212c4b819d5a2baafe672343942c003c88fc29a9..9bfea3cf51bc4bf64f3755a7b20e7a2cf439f498 100644 +index 24edc4c927c6c924c511fc480e861f6095a4681a..33d2c75103242009ba82341bc190d22f0cf7841e 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14095,6 +14095,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14148,6 +14148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch index b449978466a..02e671cfed6 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm -index 3ef8956d61f62c10b5bf4b4339ba595bb919ad17..1a680287befb53099b27a0d1a16c95197711c94f 100644 +index 3fabf9995c87458d15da377c47304d4f680a1358..f1a31f7945a838df6fad1cbf221b05905d8a8dbd 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.mm +++ b/ui/accessibility/platform/ax_platform_node_mac.mm -@@ -1169,6 +1169,7 @@ bool IsAXSetter(SEL selector) { +@@ -1168,6 +1168,7 @@ bool IsAXSetter(SEL selector) { if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index bea2003eab8..afcc4297de7 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index b88df58d50bb6de4c246de5f0edaf8f17e199a15..37d337268ebf0238a0b8d220e27f48e2078d848f 100644 +index 5b1b39a6bb5fc63dc87fd0861d6af2aa8f6f7a6e..196f8530eb8afdef96c34c5a292bc80ea7089bc9 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -455,6 +455,7 @@ component("base") { +@@ -453,6 +453,7 @@ component("base") { "//ui/strings", "//url", ] diff --git a/patches/ui-native_theme-native_theme.h.patch b/patches/ui-native_theme-native_theme.h.patch index 51410497d17..82b7b1142ad 100644 --- a/patches/ui-native_theme-native_theme.h.patch +++ b/patches/ui-native_theme-native_theme.h.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h -index 3577f9b8fa7a3b02117aacad6844fc7165c51474..531cf60ef3568ef5a032643f7d90d7f1901bd26c 100644 +index 0196aa21e880a517461001e7bbb1f3399bbc3b37..94164652a38591de9b9713ea0a2e135593e7bbd3 100644 --- a/ui/native_theme/native_theme.h +++ b/ui/native_theme/native_theme.h -@@ -457,6 +457,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -455,6 +455,7 @@ class NATIVE_THEME_EXPORT NativeTheme { // Returns the system's caption style. virtual base::Optional GetSystemCaptionStyle() const; diff --git a/patches/ui-native_theme-native_theme_mac.mm.patch b/patches/ui-native_theme-native_theme_mac.mm.patch index db148fa1b24..95e5f6fc139 100644 --- a/patches/ui-native_theme-native_theme_mac.mm.patch +++ b/patches/ui-native_theme-native_theme_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm -index 597271737417eaf50e17c371c427ff13ac363b80..d684b1be050996f1cebeda36168b568d35b182bf 100644 +index 3ac43db9720eebeeafdc44fb857bd46c2a0b27af..c48a48d8e4e139d798a06abb4c03d87911603974 100644 --- a/ui/native_theme/native_theme_mac.mm +++ b/ui/native_theme/native_theme_mac.mm -@@ -200,6 +200,7 @@ base::Optional NativeThemeMac::GetOSColor( +@@ -176,6 +176,7 @@ base::Optional NativeThemeMac::GetOSColor( // Even with --secondary-ui-md, menus use the platform colors and styling, and // Mac has a couple of specific color overrides, documented below. diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch index 002749925e6..c425e97ae09 100644 --- a/patches/ui-native_theme-native_theme_win.cc.patch +++ b/patches/ui-native_theme-native_theme_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc -index 4d0ed521015660da2376ebc9c50b0f4235ff112c..99db00e3f62b9496366f55b362c4e8b062dbd645 100644 +index 46eab8ff45a3bb874cd8b16076dd9fa918ffbd45..039a5c516b2c245936a5870a7c74caac85158094 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc -@@ -1681,6 +1681,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { +@@ -1688,6 +1688,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { &apps_use_light_theme); dark_mode_enabled = (apps_use_light_theme == 0); } diff --git a/patches/ui-native_theme-native_theme_win.h.patch b/patches/ui-native_theme-native_theme_win.h.patch index 3ee4513dec1..b87134a8d9d 100644 --- a/patches/ui-native_theme-native_theme_win.h.patch +++ b/patches/ui-native_theme-native_theme_win.h.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_win.h b/ui/native_theme/native_theme_win.h -index 236565d507dd481abc05a498d7edbf8666dc1f17..7fe7e2e687b1ecee96cbfb69e7dcb859048aa61f 100644 +index 8b273714d3dc10e69aee5bee967569ef3db05ecc..3ffcfbaac25ad00c859ac6770e1413a6fb934bce 100644 --- a/ui/native_theme/native_theme_win.h +++ b/ui/native_theme/native_theme_win.h -@@ -76,6 +76,7 @@ class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme, +@@ -74,6 +74,7 @@ class NATIVE_THEME_EXPORT NativeThemeWin : public NativeTheme, PreferredContrast CalculatePreferredContrast() const override; ColorScheme GetDefaultSystemColorScheme() const override; diff --git a/patches/ui-views-controls-button-md_text_button.h.patch b/patches/ui-views-controls-button-md_text_button.h.patch index 9ec11a615ef..253be860312 100644 --- a/patches/ui-views-controls-button-md_text_button.h.patch +++ b/patches/ui-views-controls-button-md_text_button.h.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/button/md_text_button.h b/ui/views/controls/button/md_text_button.h -index b0772c1c1e42aa2763610d3c8f01277d49c83a79..2b3330dcc75c43ee164d4346a97457aade40dd97 100644 +index ebe4f966fe6d8f4a57c79b95a4b475c7d516169d..1629ee72d652382c8365c495136ce36ab898383e 100644 --- a/ui/views/controls/button/md_text_button.h +++ b/ui/views/controls/button/md_text_button.h -@@ -57,11 +57,13 @@ class VIEWS_EXPORT MdTextButton : public LabelButton { +@@ -55,11 +55,13 @@ class VIEWS_EXPORT MdTextButton : public LabelButton { void OnBlur() override; private: diff --git a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch index bfd46ae7605..599dce58f94 100644 --- a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch +++ b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_elements/shared_style_css.html b/ui/webui/resources/cr_elements/shared_style_css.html -index a71eec20481555918d2236a18d892c3eaf86a2a0..f4205e377a449e7470d88998db9eb21510abe346 100644 +index 2f904b6fc978bdaedaa2c42e7efb8810f82bf332..51369b3bbd7690dd36e7f1fa71cc019578444ce8 100644 --- a/ui/webui/resources/cr_elements/shared_style_css.html +++ b/ui/webui/resources/cr_elements/shared_style_css.html @@ -3,12 +3,13 @@ diff --git a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch index 54b1eb758f4..0897656e39c 100644 --- a/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch +++ b/patches/ui-webui-resources-cr_elements-shared_vars_css.html.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_elements/shared_vars_css.html b/ui/webui/resources/cr_elements/shared_vars_css.html -index 4e7eb2ad96da7562783aee418d95884076eb7dfb..f0c9c8ccfe28b7a9fac2fabac521d837c8485340 100644 +index d8bda6a34f72c0e6bffbdc824b50079ad990859f..f913bc6483ca7a3e46663d7a0a3e778064855f10 100644 --- a/ui/webui/resources/cr_elements/shared_vars_css.html +++ b/ui/webui/resources/cr_elements/shared_vars_css.html @@ -1,6 +1,7 @@ From 7c463ddf2c4bb2d13228a1c5fba64f8164c1e878 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 1 Mar 2021 16:48:51 +0100 Subject: [PATCH 003/141] Updated strings for Chromium 91.0.4449.6. --- app/brave_strings.grd | 25 --- app/brave_strings_override.grd | 6 +- app/extensions_strings.grdp | 3 + app/generated_resources.grd | 203 ++++++++++-------- app/generated_resources_override.grd | 7 + app/global_media_controls_strings.grdp | 7 +- app/nearby_share_strings.grdp | 6 + app/os_settings_strings.grdp | 23 +- app/profiles_strings.grdp | 7 +- app/settings_strings.grdp | 103 ++++++--- app/shared_settings_strings.grdp | 12 +- .../strings/android_chrome_strings.grd | 62 +++--- components/components_brave_strings.grd | 3 + components/components_strings.grd | 2 + components/error_page_strings.grdp | 2 +- components/heavy_ad_intervention_strings.grdp | 16 ++ components/management_strings.grdp | 3 + components/ntp_snippets_strings.grdp | 12 -- components/omnibox_strings.grdp | 109 ++++++++-- components/payments_strings.grdp | 21 ++ components/payments_strings_override.grdp | 5 +- components/sms_strings.grdp | 2 +- components/soda_strings.grdp | 22 ++ components/sync_ui_strings.grdp | 6 +- 24 files changed, 425 insertions(+), 242 deletions(-) create mode 100644 components/heavy_ad_intervention_strings.grdp create mode 100644 components/soda_strings.grdp diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 34bef7f5ffa..26a359615bf 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -298,9 +298,6 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> Not used in Brave. Placeholder to keep resource maps in sync. - - This computer will soon stop receiving Brave updates because its hardware is no longer supported. - To get future Brave updates, you'll need OS X 10.11 or later. This computer is using OS X 10.10. @@ -557,7 +554,6 @@ Brave is unable to recover your settings. Brave API keys are missing. Some functionality of Brave will be disabled. - @@ -568,18 +564,6 @@ Brave is unable to recover your settings. Also clear data from Brave ($1www.google.com) - - - - - Hide in Brave menu - - - - - Hide in Brave Menu - - @@ -781,15 +765,6 @@ Brave is unable to recover your settings. Chrome OS System - - Chrome OS could not sync your data. - - - Chrome OS could not sync your passwords. - - - Chrome OS could not sync your data. Please update your Sync passphrase. - Chrome OS could not sync your data because your account sign-in details are out of date. diff --git a/app/brave_strings_override.grd b/app/brave_strings_override.grd index 5c146cf8f64..eb293cac6ad 100644 --- a/app/brave_strings_override.grd +++ b/app/brave_strings_override.grd @@ -148,11 +148,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> - - - - - + Warning: Brave cannot prevent extensions from recording your browsing history. To disable this extension in private mode, unselect this option. diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp index 8a51286d3bb..fb28d52f0a4 100644 --- a/app/extensions_strings.grdp +++ b/app/extensions_strings.grdp @@ -389,6 +389,9 @@ Load unpacked + + Extension loaded + Pack extension diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 3bce8a32e5b..a50d81267da 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -1288,7 +1288,7 @@ are declared in tools/grit/grit_rule.gni. - Brave’s Terms of Service are changing March 31 + Brave's Terms of Service are changing March 31 Please review the new terms @@ -4216,15 +4216,6 @@ are declared in tools/grit/grit_rule.gni. Disable - - Hide button - - - Keep in toolbar - - - Show in toolbar - Pin @@ -4337,7 +4328,15 @@ Keep your key file in a safe place. You will need it to create new versions of y $1c:\users\aa\myextension.crx - + + Continue to install + + + Proceed with caution + + + This extension is not trusted by Enhanced Safe Browsing. + Add @@ -4835,28 +4834,6 @@ Keep your key file in a safe place. You will need it to create new versions of y - - - Updated $130 min ago - - - Updated 1hr ago - - - Updated $14 hrs ago - - - Updated just now - - - - - Lite mode now makes browsing faster on all pages, including HTTPS. - - - Settings - - WebRTC logs @@ -5241,13 +5218,13 @@ Keep your key file in a safe place. You will need it to create new versions of y Type a valid URL - Can’t create shortcut + Can't create shortcut - Can’t edit shortcut + Can't edit shortcut - Can’t remove shortcut + Can't remove shortcut Shortcut removed @@ -5522,7 +5499,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Why am I seeing this? - You’re seeing this item based on your previous activity using Brave services. You can see your data, delete it, and change your settings at <a href="$1" target="_blank" rel="noopener noreferrer">myactivity.google.com</a>. + You're seeing this item based on your previous activity using Brave services. You can see your data, delete it, and change your settings at <a href="$1" target="_blank" rel="noopener noreferrer">myactivity.google.com</a>. Learn about the data Brave collects and why at <a href="$1" target="_blank" rel="noopener noreferrer">policies.google.com</a>. @@ -5537,13 +5514,13 @@ Keep your key file in a safe place. You will need it to create new versions of y Find what you added to shopping carts and check out when you're ready - Carts hidden. They’ll reappear when you make changes. + Carts hidden. They'll reappear when you make changes. Hide $1Amazon - $1Amazon hidden. You’ll see it again when you revisit your cart. + $1Amazon hidden. You'll see it again when you revisit your cart. Never show $1Amazon @@ -5636,7 +5613,13 @@ Keep your key file in a safe place. You will need it to create new versions of y Press to go back, context menu to see history - Experiments + Experiments + + + Select experiment state + + + Send feedback for $1Tab Scrolling Click to go forward, hold to see history @@ -5860,6 +5843,9 @@ Keep your key file in a safe place. You will need it to create new versions of y When you're ready, find your reading list here + + Add this page to reading list + Reopen a tab if you accidentally closed it @@ -5974,11 +5960,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Password updated - - {COUNT, plural, - =1 {You have 1 compromised password} - other {You have # compromised passwords}} - {COUNT, plural, =1 {Successfully changed the compromised password. You have # more compromised password. Brave recommends checking this password now.} @@ -5990,17 +5971,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Settings - - {COUNT, plural, - =1 {Brave recommends checking this password now} - other {Brave recommends checking these passwords now}} - Check remaining passwords - - Check passwords - Save @@ -6239,7 +6212,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Attach <a href="#" id="bluetooth-logs-info-link">Bluetooth Logs</a> (Brave internal) - This information helps us better understand your Assistant issue. It’s stored for up to 90 days and access is restricted to appropriate engineering and feedback teams. + This information helps us better understand your Assistant issue. It's stored for up to 90 days and access is restricted to appropriate engineering and feedback teams. To better diagnose Bluetooth issues, Bravers can include additional Bluetooth logs with their feedback reports. When this option is checked, your report will include btsnoop and HCI logs from your current session, sanitized to remove as much PII as possible. Access to these logs will be restricted to managers of the Chrome OS product group in Listnr. Logs will be purged after 90 days. @@ -7582,16 +7555,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Apps - You’re browsing as a Guest + You're browsing as a Guest - Pages you view in this window won’t appear in the browser history and they won’t leave other traces, like cookies, on the computer after you sign out. Files you download and bookmarks you create won’t be preserved. + Pages you view in this window won't appear in the browser history and they won't leave other traces, like cookies, on the computer after you sign out. Files you download and bookmarks you create won't be preserved. - Pages you view in this window won’t appear in the browser history and they won’t leave other traces, like cookies, on the computer after you close all open Guest windows. Any files you download will be preserved, however. + Pages you view in this window won't appear in the browser history and they won't leave other traces, like cookies, on the computer after you close all open Guest windows. Any files you download will be preserved, however. @@ -8129,7 +8102,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Sign-in error - Sync error + Sync isn't working Sync isn't working @@ -8150,10 +8123,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Enter passphrase - Fix now + Verify it's you - Fix now + Verify it's you Sign in again @@ -8165,6 +8138,18 @@ Please help our engineers fix this problem. Tell us what happened right before y Open settings + + + To start sync, enter your passphrase + + + To sync your passwords, verify it's you + + + To start sync, verify it's you + + + OK... @@ -8222,10 +8207,10 @@ Please help our engineers fix this problem. Tell us what happened right before y Setup in progress... - Sync isn’t working. Try signing in again. + Sync isn't working. Try signing in again. - Sync isn’t working. Try signing out and back in again. + Sync isn't working. Try signing out and back in again. Enter your passphrase to sync your data @@ -8234,7 +8219,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Enter passphrase - Fix now + Verify it's you @@ -9565,6 +9550,9 @@ Please help our engineers fix this problem. Tell us what happened right before y {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}} + + Presenter Tools + This Tab @@ -10083,12 +10071,8 @@ Please help our engineers fix this problem. Tell us what happened right before y "$1Brave Extension Name" wants to connect to a HID device - - Unknown Device (Vendor: $10x1234, Product: $20xabcd) - - - $1Wireless Controller (Vendor: $20x1234, Product: $30xabcd) - + + Unknown Device ($11234:abcd) Finding devices... @@ -10135,20 +10119,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Ads blocked on this site - - - Details - - - Ad removed. - - - This ad used too many resources for your device, so Brave removed it. - - - Reload and show anyway - - Windows Utilities @@ -10368,7 +10338,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Can't open this folder - $1example.com can’t open this folder because it contains system files + $1example.com can't open this folder because it contains system files Choose a different folder @@ -10377,7 +10347,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Can't open this file - $1example.com can’t open files in this folder because it contains system files + $1example.com can't open files in this folder because it contains system files Choose a different file @@ -10576,13 +10546,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Touch your security key again to complete the request. - The PINs you entered don’t match + The PINs you entered don't match The security key is locked because the wrong PIN was entered too many times. To unlock it, remove and reinsert it. - The security key is locked because the wrong PIN was entered too many times. You’ll need to reset the security key. + The security key is locked because the wrong PIN was entered too many times. You'll need to reset the security key. Reinsert your security key and try again @@ -10943,6 +10913,65 @@ Please help our engineers fix this problem. Tell us what happened right before y Experiments + + + Send Feedback + + + + + Send feedback + + + + Send feedback for $1Tab Scrolling. + + + Default + + + Enabled + + + Disabled + + + Enabled – $1tabs shrink to pinned tab width + + + + + Reading List + + + Right click on a tab or click the Bookmark icon to add tabs to a reading list. Access from the Bookmarks bar. + + + + Tab Scrolling + + + Enables tab strip to scroll left and right when full. + + + Tabs shrink to pinned tab width + + + Tabs shrink to a medium width + + + Tabs shrink to a large width + + + Tabs don't shrink + + + + Tab Search + + + Enable a popup bubble in Top Brave UI to search over currently open tabs. + diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 97f26c2d7df..5ba2e6ce579 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -718,6 +718,9 @@ are declared in tools/grit/grit_rule.gni. + + + @@ -914,6 +917,10 @@ are declared in tools/grit/grit_rule.gni. + + + + diff --git a/app/global_media_controls_strings.grdp b/app/global_media_controls_strings.grdp index 080652f54a6..42bfb431488 100644 --- a/app/global_media_controls_strings.grdp +++ b/app/global_media_controls_strings.grdp @@ -16,10 +16,13 @@ Stop casting - - + + Live Caption (English only) + + Live Caption + Downloading... $117% diff --git a/app/nearby_share_strings.grdp b/app/nearby_share_strings.grdp index 7a71b5443ef..71a4cb0663d 100644 --- a/app/nearby_share_strings.grdp +++ b/app/nearby_share_strings.grdp @@ -348,4 +348,10 @@ Nearby Share + + $1Ted's Pixel 2 did not accept the file + + + $1Ted's Pixel 2 cancelled the transfer + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 461c8b3ad00..39ddd323a54 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -747,6 +747,9 @@ Invalid URL format. Server must be specified as a host name when SSO authentication is used. + + Invalid username + Share mounted successfully. @@ -2265,6 +2268,9 @@ Press an assigned switch to remove assignment. Unable to connect to this profile. For technical support, please contact your carrier. + + Profile could not be downloaded. Please try again later or contact carrier for help. + Rename Profile @@ -2373,12 +2379,6 @@ Press an assigned switch to remove assignment. Network out of range - - Trouble connecting. Please contact $1Brave Fi for assistance. - - - Trouble connecting. Please contact your carrier for assistance. - Set up new network @@ -2455,10 +2455,10 @@ Press an assigned switch to remove assignment. Instant Tethering - No available eSIM profiles. Download a new profile <a href="#" id="cellularEsimLink">here</a> + No available eSIM profiles. Download a new profile <a href="#" id="cellularEsimLink">here.</a> - No available SIM profiles. Setup a new profile <a href="#" id="cellularPsimLink">here.</a> + No available SIM profiles. Set up a new profile <a href="#" id="cellularPsimLink">here.</a> No device detected <a target="_blank" rel="noopener noreferrer" href="$1">Learn more</a> @@ -2683,7 +2683,9 @@ Press an assigned switch to remove assignment. Change PIN - $11 fingerprints set up + {COUNT, plural, + =1 {1 fingerprint set up} + other {{COUNT} fingerprints set up}} Sign in automatically @@ -3213,6 +3215,9 @@ Press an assigned switch to remove assignment. Note: Your fingerprint may be less secure than a strong password or PIN. + + Your fingerprint data is stored securely and never leaves your $1Bravebook. <a>Learn more</a> + diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp index 98c3a11da73..ff70c7eafe4 100644 --- a/app/profiles_strings.grdp +++ b/app/profiles_strings.grdp @@ -597,8 +597,11 @@ Guest mode - - Back + + Back from $1Set up your new Brave profile page + + + Back from sign in Sign in diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 2c62b3527d0..cb2b47f4cb7 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -58,14 +58,20 @@ Live Caption - + Automatically creates captions for media in Brave browser (currently available in English). Audio and captions are processed locally and never leave the device. + + Automatically creates captions for media in Brave browser. Audio and captions are processed locally and never leave the device. + - + Automatically creates captions for English audio and video. Audio and captions never leave your device. + + Automatically creates captions for audio and video. Audio and captions never leave your device. + Downloading speech recognition files... $117% @@ -1101,6 +1107,12 @@ This language is used when translating pages + + Language is set by your Organization + + + Your administrator has set a default language which cannot be modified. + Keyboard apps @@ -1775,7 +1787,7 @@ Sites can ask to track your camera position - Block sites from tracking your camera position + Don't allow sites to track your camera position Allowed to track your camera position @@ -1790,7 +1802,7 @@ Sites can ask to automatically download multiple files (recommended) - Block sites from automatically downloading multiple files + Don't allow sites to automatically download multiple files Allowed to automatically download multiple files @@ -1799,13 +1811,13 @@ Not allowed to automatically download multiple files - After you leave or go offline, sites usually keep syncing to finish tasks, like uploading photos or sending a chat message + After you leave a site, it can keep syncing to finish tasks, like uploading photos or sending a chat message Recently closed sites can finish sending and receiving data (recommended) - Block closed sites from sending and receiving data + Don't allow closed sites to finish sending or receiving data Allowed to finish sending and receiving data @@ -1820,7 +1832,7 @@ Sites can ask to use your camera (recommended) - Block sites from using your camera + Don't allow sites to use your camera Features that need a camera won't work @@ -1838,7 +1850,7 @@ Sites can ask to see text and images on your clipboard - Block sites from seeing text and images on your clipboard + Don't allow sites from to see text or images on your clipboard Allowed to see your clipboard @@ -1850,13 +1862,13 @@ Sites usually access files and folders on your device for features like automatically saving your work - Sites can ask to edit files or folders on your device (recommended) + Sites can ask to edit files and folders on your device (recommended) - Block sites from editing files and folders on your device + Don't allow sites to edit files or folders on your device - Not allowed to edit files and folders on your device + Not allowed to edit files or folders on your device Sites usually use your location for relevant features or info, like local news or nearby shops @@ -1865,7 +1877,7 @@ Sites can ask for your location (recommended) - Block sites from seeing your location + Don't allow sites to see your location Features that need your location won't work @@ -1898,7 +1910,7 @@ Sites can use Javascript (recommended) - Block Javascript + Don't allow sites to use Javascript Allowed to use Javascript @@ -1913,7 +1925,7 @@ Sites can ask to use your microphone (recommended) - Block sites from using your microphone + Don't allow sites to use your microphone Features that need a microphone won't work @@ -1931,7 +1943,7 @@ Sites can ask to connect to MIDI devices - Block sites from connecting to MIDI devices + Don't allow sites to connect to MIDI devices Allowed to connect to MIDI devices @@ -1958,7 +1970,7 @@ Sites can't interrupt you by asking to send notifications - Block notifications + Don't allow sites to send notifications Features that need notifications won't work @@ -1976,7 +1988,7 @@ Sites can install payment handlers (recommended) - Block payment handlers + Don't allow sites to install payment handlers Allowed to install payment handlers @@ -1991,7 +2003,7 @@ Sites can send pop-ups and use redirects - Block pop-ups and redirects (recommended) + Don't allow sites to send pop-ups or use redirects (recommended) Allowed to send pop-ups and use redirects @@ -2006,7 +2018,7 @@ Sites can ask to play protected content (recommended) - Block protected content + Don't allow sites to play protected content Allowed to play protected content @@ -2015,13 +2027,13 @@ Not allowed to play protected content - Sites usually use your device's motion sensors for features like virtual reality or step counting + Sites usually use your device's motion sensors for features like virtual reality or fitness tracking Sites can use motion sensors - Block sites from using motion sensors + Don't allow sites to use motion sensors Features that need motion sensors won't work @@ -2039,7 +2051,7 @@ Sites can ask to connect to serial devices - Block sites from connecting to serial devices + Don't allow sites to connect to serial devices Sites might play sound to provide audio for music, videos, and other media @@ -2048,7 +2060,7 @@ Sites can play sound (recommended) - Mute sound + Don't allow sites to play sound Allowed to play sound @@ -2056,6 +2068,33 @@ Not allowed to play sound + + Sites usually connect to Bluetooth devices for features like setting up or syncing a low-energy beacon, a health or fitness tracker, or a smart light bulb + + + Sites can ask to connect to Bluetooth devices + + + Don't allow sites to connect to Bluetooth devices + + + Sites usually connect to HID devices for features that use uncommon keyboards, game controllers, and other devices + + + Sites can ask to connect to HID devices + + + Don't allow sites to connect to HID devices + + + Sites can ask to handle protocols + + + Don't allow sites to handle protocols + + + Not allowed to handle protocols + Sites usually connect to USB devices for features like printing a document or saving to a storage device @@ -2063,7 +2102,7 @@ Sites can ask to connect to USB devices - Block sites from connecting to USB devices + Don't allow sites to connect to USB devices Sites usually use your virtual reality devices and data to let you enter VR sessions @@ -2072,13 +2111,13 @@ Sites can ask to use virtual reality devices and data - Block sites from using virtual reality devices and data + Don't allow sites to use virtual reality devices or data Allowed to use virtual reality devices and data - Not allowed to use virtual reality devices and data + Not allowed to use virtual reality devices or data You can set how much you zoom in or out on certain websites @@ -2270,7 +2309,7 @@ Javascript - Payment Handlers + Payment handlers payment handlers @@ -2412,19 +2451,19 @@ Do not allow any sites to access serial ports - + File editing - + file editing - + Ask when a site wants to edit files or folders on your device - + Ask when a site wants to edit files or folders on your device (recommended) - + Do not allow any sites to edit files or folders on your device diff --git a/app/shared_settings_strings.grdp b/app/shared_settings_strings.grdp index a46a03de10b..fed5171df69 100644 --- a/app/shared_settings_strings.grdp +++ b/app/shared_settings_strings.grdp @@ -116,7 +116,7 @@ Current device name is $1Michael's Bravebook - Manage Contacts + Manage contacts Contacts @@ -234,7 +234,7 @@ Sync isn't working - Error syncing passwords + Password sync isn't working Manage sync @@ -255,7 +255,7 @@ - Addresses, phone numbers, and more + Addresses and more History @@ -264,7 +264,7 @@ Extensions - Open Tabs + Open tabs Wi-Fi networks @@ -299,13 +299,13 @@ Submit - Encrypt synced passwords with your Brave username and password + Encrypt synced passwords with your Brave sync chain Bookmarks - Reading List + Reading list Encryption options diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 549ff3c60ff..e0173cf038b 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -1235,7 +1235,7 @@ Your Brave account may have other forms of browsing history like searches and ac What languages do you read? - Downloading %1$sHindi… + Downloading… Language ready, restart %1$sBrave @@ -1672,9 +1672,6 @@ Your Brave account may have other forms of browsing history like searches and ac Tabs that you've opened in Brave on your other devices will appear here. - - Sync - Search and browse @@ -1685,7 +1682,7 @@ Your Brave account may have other forms of browsing history like searches and ac Sync everything - Autofill + Addresses and more Bookmarks @@ -1703,7 +1700,7 @@ Your Brave account may have other forms of browsing history like searches and ac Settings - Credit cards and addresses using Brave Pay + Payment methods and addresses using Brave Pay Encryption @@ -1715,7 +1712,7 @@ Your Brave account may have other forms of browsing history like searches and ac Encryption - Encrypt passwords with Brave credentials + Encrypt synced passwords with your Brave sync chain Encrypt synced data with Brave password as of %1$sOct 3, 2014 @@ -1835,7 +1832,7 @@ To change this setting, <resetlink>reset sync

- Error syncing passwords + Password sync isn't working Initial sync setup not finished @@ -1846,11 +1843,14 @@ To change this setting, <resetlink>reset sync

Sign in again to start sync - - Fix now + + To start sync, verify it's you + + + To sync your passwords, verify it's you - Enter your passphrase to start sync + To start sync, enter your passphrase Choose what to sync below @@ -1878,6 +1878,9 @@ To change this setting, <resetlink>reset sync

Sign in again + + Verify it's you + @@ -1944,9 +1947,6 @@ To change this setting, <resetlink>reset sync

Options available near top of the screen - - Simplified page to save data and load faster. - @@ -2274,9 +2274,6 @@ To change this setting, <resetlink>reset sync

This page may differ from the online version. - - <link>Load original page</link> from %1$sgoogle.com - You are viewing a preview of this page @@ -2781,6 +2778,8 @@ Data from your Private session will only be cleared from Brave when you Discover by Brave - off + For you + Following Control your stories and activity here @@ -3012,15 +3011,6 @@ Data from your Private session will only be cleared from Brave when you Stop image descriptions - - Add to… - - - Add to - - - Home screen - @@ -3132,9 +3122,6 @@ Data from your Private session will only be cleared from Brave when you - - Reading list - Reading list <new>New</new> @@ -3237,9 +3224,6 @@ Data from your Private session will only be cleared from Brave when you Offline - - Lite - Preview @@ -3539,6 +3523,11 @@ Data from your Private session will only be cleared from Brave when you + + + Following... + + Brave %1$sBrave storage @@ -3672,6 +3661,9 @@ Data from your Private session will only be cleared from Brave when you Establishing a tunnel via proxy server failed + + Apps + @@ -3824,12 +3816,6 @@ Data from your Private session will only be cleared from Brave when you To see top sites and stories for you, tap the Home button - - Lite page provided by Brave. Tap to load the original. - - - Lite page provided by Brave. Tap the load original button to load the original page. - Open tabs to visit different pages at the same time diff --git a/components/components_brave_strings.grd b/components/components_brave_strings.grd index 32c41542f19..f307775c72b 100644 --- a/components/components_brave_strings.grd +++ b/components/components_brave_strings.grd @@ -212,6 +212,9 @@ settings. + + This page has been blocked by Brave + Chrome OS hasn’t completed its initial setup. diff --git a/components/components_strings.grd b/components/components_strings.grd index 2c8d84db5ed..5f500cf9913 100644 --- a/components/components_strings.grd +++ b/components/components_strings.grd @@ -296,6 +296,7 @@ + @@ -318,6 +319,7 @@ + diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp index bb778803f75..ccfe427cd38 100644 --- a/components/error_page_strings.grdp +++ b/components/error_page_strings.grdp @@ -248,7 +248,7 @@ <strong jscontent="hostName"></strong>www.whatever.com didn’t accept your login certificate, or one may not have been provided. - Requests to the server have been blocked by an extension. + This page has been blocked by an extension The profile who set up this computer has chosen to block this site. diff --git a/components/heavy_ad_intervention_strings.grdp b/components/heavy_ad_intervention_strings.grdp new file mode 100644 index 00000000000..390141ea30b --- /dev/null +++ b/components/heavy_ad_intervention_strings.grdp @@ -0,0 +1,16 @@ + + + + + Details + + + Ad removed. + + + This ad used too many resources for your device, so Brave removed it. + + + Reload and show anyway + + diff --git a/components/management_strings.grdp b/components/management_strings.grdp index 9f81b2c9a4b..52b40dd66ba 100644 --- a/components/management_strings.grdp +++ b/components/management_strings.grdp @@ -112,6 +112,9 @@ Names of files that you print + + Printing history + Linux apps installed and when they were last used diff --git a/components/ntp_snippets_strings.grdp b/components/ntp_snippets_strings.grdp index a348009ce37..71de58a198d 100644 --- a/components/ntp_snippets_strings.grdp +++ b/components/ntp_snippets_strings.grdp @@ -24,18 +24,6 @@ - - - Suggestions by Brave - - - - - - Suggestions by Brave - - - Your suggested articles appear here diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp index ebcd1a56c3a..cf137fc6aea 100644 --- a/components/omnibox_strings.grdp +++ b/components/omnibox_strings.grdp @@ -104,9 +104,6 @@ Clear browsing data - - Clear - Clear your browsing history, cookies, cache, and more in Brave settings @@ -120,9 +117,6 @@ Manage passwords - - Manage - View and manage your passwords in Brave settings @@ -136,9 +130,6 @@ Manage payment methods - - Manage - Manage your payments and credit card info in Brave settings @@ -152,9 +143,6 @@ Open Private window - - Open - Open a new Private window to browse privately @@ -168,9 +156,6 @@ Translate page - - Translate - Translate this page with Brave Translate @@ -184,9 +169,6 @@ Update Brave - - Update - Update Brave from your Brave settings @@ -197,6 +179,97 @@ Update Brave button, press Enter to update Brave from your Brave settings + + Run Brave Safety Check + + + Run a Safety Check in Brave settings + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to run Safety Check in Brave settings + + + Run Brave Safety Check button, press Enter to run Safety Check in Brave settings + + + + Manage security settings + + + Manage your Safe Browsing and more in Brave settings + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to Manage your Safe Browsing and more in Brave settings + + + Manage security settings button, press Enter to Manage your Safe Browsing and more in Brave settings + + + + Manage cookies + + + Manage your cookie preferences in Brave settings + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to manage your cookie preferences in Brave settings + + + Manage cookies button, press Enter to manage your cookie preferences in Brave settings + + + + Manage addresses + + + Add and manage addresses in Brave settings + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to add and manage addresses in Brave settings + + + Manage addresses button, press Enter to add and manage addresses in Brave settings + + + + Manage sync + + + Manage what info you sync in Brave settings + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to manage what info you sync in Brave settings + + + Manage sync button, press Enter to manage what info you sync in Brave settings + + + + Manage site settings + + + Manage permissions and data stored across sites in Brave settings + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to manage permissions and data stored across sites in Brave settings + + + Manage site settings button, press Enter to manage permissions and data stored across sites in Brave settings + + + + Create Brave Doc + + + Create a new Brave Doc quickly + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to Create Brave Doc + + + Create Brave Doc button, press Enter to Create a new Brave Doc quickly + + diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp index 12112848b33..b606640b6ba 100644 --- a/components/payments_strings.grdp +++ b/components/payments_strings.grdp @@ -628,11 +628,23 @@ Use Touch ID to verify and complete your purchase? + + You can use Touch ID to quickly verify it's you the next time you use this device to make a purchase with this payment method. + + + Use Touch ID + Use Windows Hello to verify and complete your purchase? + + You can use Windows Hello to quickly verify it's you the next time you use this device to make a purchase with this payment method. + + + Use Windows Hello + Store @@ -643,4 +655,13 @@ Verify + + Check out faster next time + + + Sign-in data will be stored on this device after you exit private mode. + + + No thanks + diff --git a/components/payments_strings_override.grdp b/components/payments_strings_override.grdp index ff3321dd814..74794e798eb 100644 --- a/components/payments_strings_override.grdp +++ b/components/payments_strings_override.grdp @@ -34,4 +34,7 @@ - + + Sign-in data will be stored on this device after you exit private mode. + + diff --git a/components/sms_strings.grdp b/components/sms_strings.grdp index 2348c2ad9af..1668fe822b9 100644 --- a/components/sms_strings.grdp +++ b/components/sms_strings.grdp @@ -9,7 +9,7 @@ $1123 is your code for $2example.com - + $1123 is your code for $3iframe.com to continue on $2example.com diff --git a/components/soda_strings.grdp b/components/soda_strings.grdp new file mode 100644 index 00000000000..a77a1e5a74a --- /dev/null +++ b/components/soda_strings.grdp @@ -0,0 +1,22 @@ + + + + + English + + + French + + + German + + + Italian + + + Japanese + + + Spanish + + diff --git a/components/sync_ui_strings.grdp b/components/sync_ui_strings.grdp index 86203e79d1f..8e8347e4993 100644 --- a/components/sync_ui_strings.grdp +++ b/components/sync_ui_strings.grdp @@ -3,13 +3,13 @@ - Encrypt synced passwords with your Brave credentials + Encrypt synced passwords with your Brave sync chain Please update your sync passphrase. - Autofill + Addresses and More Bookmarks @@ -21,7 +21,7 @@ Settings - Open tabs + Open Tabs History From a77b984fd4e46c611dde798425b5e059a63535aa Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 1 Mar 2021 17:18:40 +0100 Subject: [PATCH 004/141] Add definition for new constant kCwsEnhancedSafeBrowsingLearnMoreURL Chromium changes: https://source.chromium.org/chromium/chromium/src/+/62c702ddef7beeabb1d90424b4c8196768c20289 commit 62c702ddef7beeabb1d90424b4c8196768c20289 Author: Jeff Cyr Date: Fri Feb 26 18:57:05 2021 +0000 Implement the CRX install friction dialog for ESB users. This dialog is shown to Enhanced Safe Browsing users when adding an extension that is not included in the Safe Browsing CRX allowlist. The user can choose to cancel the install or to proceed to the install dialog. Bug: 1176721 --- chromium_src/chrome/common/url_constants.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index cb720e3f6dc..af6eb851e81 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -206,6 +206,9 @@ const char kUpgradeHelpCenterBaseURL[] = const char kWhoIsMyAdministratorHelpURL[] = "https://support.brave.com/"; +const char kCwsEnhancedSafeBrowsingLearnMoreURL[] = + "https://support.brave.com/"; + #if defined(OS_ANDROID) const char kEnhancedPlaybackNotificationLearnMoreURL[] = // Keep in sync with chrome/android/java/strings/android_chrome_strings.grd From 706f8057c723550f7627d8b715ca0aafd2077f55 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 1 Mar 2021 17:12:02 +0100 Subject: [PATCH 005/141] Adapt to changes in TabHoverCardBubbleView and TabHoverCardController TabHoverCardBubbleView::UpdateCardContent() used to be a private method and now it's public, so we need to adjust it in the chromium_src override. Also, we need to adapt the browsertests to small changes now that part of TabHoverCardBubbleView has been split off into TabHoverCardController. Chromium changes: https://source.chromium.org/chromium/chromium/src/+/1f24ab638760a2d965b02c152442bb92edb7b8fa commit 1f24ab638760a2d965b02c152442bb92edb7b8fa Author: Dana Fried Date: Fri Feb 26 23:06:19 2021 +0000 Reland "Split Tab Hover Cards into view and controller." This reverts commit 7792ad296eb44bd00e8db891e85a363ab2966635. Reason for revert: Fix two potential issues: - null pointer dereference trying to close a hover card that is not open - incorrect show/flicker of hover card on page update in some cases (The later was causing the trybot failure; the former caused the attached bug.) Bug: 1182569 Original change's description: > Revert "Split Tab Hover Cards into view and controller." > > This reverts commit 3387f04559744177e8d0c19b0c66a6a14730de0d. > > Reason for revert: Consistent failure on linux-trusty-rel > Recent failure: https://ci.chromium.org/ui/p/chromium/builders/ci/linux-trusty-rel/21525/overview > > Original change's description: > > Split Tab Hover Cards into view and controller. > > > > Part of an effort to move hover cards to a MVC organization so that we > > can have more control over when cards are shown and what tabs they are > > shown for. Once the controller is separated, we can exert finer control > > over when the widget is created and destroyed and when thumbnails are > > requested. > > > > There are a number of outstanding performance issues that the above > > changes would facilitate, e.g. detecting quick move-across as per > > crbug.com/1177601 or just destroying the widget when we're not using it > > to save compositor memory. > > > > Note: This change should *not* affect any existing Hover Card behavior. > > If it does, that should be amended before improvements or optimizations > > are attempted. > > > > Change-Id: Icafe193337737b7736055bd3183b42f1ec140bcb > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2714213 > > Commit-Queue: Dana Fried > > Reviewed-by: Caroline Rising > > Cr-Commit-Position: refs/heads/master@{#857928} > > Change-Id: Id75208aa644688c2b377e25f60757c0e2e98e65f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2720025 > Auto-Submit: Jiewei Qian > Commit-Queue: Rubber Stamper > Bot-Commit: Rubber Stamper > Cr-Commit-Position: refs/heads/master@{#857973} --- .../browser/ui/views/tabs/tab_hover_card_bubble_view.h | 1 - .../tabs/tab_hover_card_bubble_view_browsertest.cc | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h index 3956abaf352..1b740ba8e58 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h @@ -24,7 +24,6 @@ class TabHoverCardBubbleView : public TabHoverCardBubbleView_ChromiumImpl { using TabHoverCardBubbleView_ChromiumImpl:: TabHoverCardBubbleView_ChromiumImpl; - private: void UpdateCardContent(const Tab* tab) override; DISALLOW_COPY_AND_ASSIGN(TabHoverCardBubbleView); diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc index f48f9a40973..cb13c4fbba7 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h" +#include "chrome/browser/ui/views/tabs/tab_hover_card_controller.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -50,7 +51,7 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest { TabHoverCardBubbleViewBrowserTest() : animation_mode_reset_(gfx::AnimationTestApi::SetRichAnimationRenderMode( gfx::Animation::RichAnimationRenderMode::FORCE_DISABLED)) { - TabHoverCardBubbleView::disable_animations_for_testing_ = true; + TabHoverCardController::disable_animations_for_testing_ = true; } ~TabHoverCardBubbleViewBrowserTest() override = default; @@ -59,8 +60,8 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest { DialogBrowserTest::SetUp(); } - static TabHoverCardBubbleView* GetHoverCard(const TabStrip* tabstrip) { - return tabstrip->hover_card_; + TabHoverCardBubbleView* GetHoverCard(const TabStrip* tab_strip) { + return tab_strip->hover_card_controller_->hover_card_; } static Widget* GetHoverCardWidget(TabHoverCardBubbleView* hover_card) { @@ -81,7 +82,8 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest { // We don't use Tab::OnMouseEntered here to invoke the hover card because // that path is disabled in browser tests. If we enabled it, the real mouse // might interfere with the test. - tab_strip->UpdateHoverCard(tab_strip->tab_at(index)); + tab_strip->UpdateHoverCard(tab_strip->tab_at(index), + TabController::HoverCardUpdateType::kHover); } // DialogBrowserTest: From 6062009c38cbb593f874119ba1b28ff60dc7fddc Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 1 Mar 2021 19:06:14 +0100 Subject: [PATCH 006/141] Fix crash at startup due to kGCMChannelStatus not being registered This boolean preference has now been removed from the codebase, causing Brave to crash on startup since the SetDefaultPrefValue() call to set its default value will now be operating on an unregistered preference. If we want to keep the migration code working, we need to register the preference ourselves now, as well as to make sure it gets cleared once the migration step has been completed. commit 7f84e6bdce3395eef254aec617bc76dff41b3a8f Author: Tibor Goldschwendt Date: Fri Feb 26 22:21:35 2021 +0000 Cleanup prefs deprecated in 1/2020 and 2/2020 --- browser/gcm_driver/brave_gcm_utils.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/gcm_driver/brave_gcm_utils.cc b/browser/gcm_driver/brave_gcm_utils.cc index 01d8d357eed..0af71bfa37a 100644 --- a/browser/gcm_driver/brave_gcm_utils.cc +++ b/browser/gcm_driver/brave_gcm_utils.cc @@ -18,8 +18,8 @@ const char kGCMChannelStatus[] = "gcm.channel_status"; void RegisterGCMProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Deprecated Chromium pref. - registry->SetDefaultPrefValue(kGCMChannelStatus, base::Value(false)); - // Current Brave eqiuvalent of the deprecated pref. + registry->RegisterBooleanPref(kGCMChannelStatus, false); + // Current Brave equivalent of the deprecated pref. registry->RegisterBooleanPref(kBraveGCMChannelStatus, false); } @@ -29,6 +29,7 @@ void MigrateGCMPrefs(Profile* profile) { auto* pref = prefs->FindPreference(kGCMChannelStatus); if (pref && !pref->IsDefaultValue()) prefs->SetBoolean(kBraveGCMChannelStatus, pref->GetValue()->GetBool()); + prefs->ClearPref(kGCMChannelStatus); } } // namespace gcm From a311b578838e35e67e46e7a7372d9cba48706bbd Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 8 Mar 2021 13:14:18 +0100 Subject: [PATCH 007/141] Patch inheritance for Android's LanguageSettings class in the right place Chromium changes: https://source.chromium.org/chromium/chromium/src/+/f3c257e9298faf4da38daa674571c7ad08873106 commit f3c257e9298faf4da38daa674571c7ad08873106 Author: Trevor Perrier Date: Tue Mar 2 23:15:47 2021 +0000 [Android] Move LanguageSettings to //chrome/browser/language This CL moves LangaugeSettings.java and the associated XML files out of //chrome/android to the //chrome/browser/language module. There are no UI changes from this CL. A follow up CL will move the language related tests to //chrome/browser/language. Bug: 1124096 --- ...er-language-settings-LanguageSettings.java.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch diff --git a/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch b/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch new file mode 100644 index 00000000000..6ac4e186e34 --- /dev/null +++ b/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java +index 2de272e8e851996eeb823a09fc650237cd169c02..f81c3c5034b389ba09398c2590786587dd7dd113 100644 +--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java ++++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java +@@ -37,7 +37,7 @@ import java.util.Collection; + * Settings fragment that displays information about Chrome languages, which allow users to + * seamlessly find and manage their languages preferences across platforms. + */ +-public class LanguageSettings extends PreferenceFragmentCompat ++public class LanguageSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment + implements AddLanguageFragment.Launcher, FragmentSettingsLauncher { + // Default number of items to list in a collection preference summary. + private static final int COLLECTION_SUMMARY_ITEM_LIMIT = 3; From 029df69f2a934a47f1a4cb5a536fd9de5d02c880 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 8 Mar 2021 16:11:07 +0100 Subject: [PATCH 008/141] Add newly-added parameter to overriden virtual method from WCO WebContentsObserver::DocumentOnLoadCompletedInMainFrame() takes a RenderFrameHost* parameter now. Chromium changes: https://source.chromium.org/chromium/chromium/src/+/115c0c69af6ca3c5b1f84007c050469a72fd2e53 commit 115c0c69af6ca3c5b1f84007c050469a72fd2e53 Author: Lucas Furukawa Gadani Date: Fri Mar 5 03:55:51 2021 +0000 Reland "Pass RenderFrameHost to WebContentsObservers." This is a reland of ec83e34d3b2f9f137d17b6165a0b18c87f3295ba Original change's description: > Pass RenderFrameHost to WebContentsObservers. > > This CL passes the RenderFrameHost to > DocumentOnLoadCompletedInMainFrame and DocumentAvailableInMainFrame > observer callbacks. > > Observer implementations will be updated to handle non-primary main > frames in future CLs. > > Bug: 1182780 > Change-Id: I528aaed22bae8e4e3e1a77fe318a8b3e03c3895d > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2721028 > Auto-Submit: Lucas Gadani > Commit-Queue: Charlie Reis > Reviewed-by: Charlie Reis > Owners-Override: Charlie Reis > Cr-Commit-Position: refs/heads/master@{#859575} Bug: 1182780 --- browser/brave_ads/ads_tab_helper.cc | 6 ++---- browser/brave_ads/ads_tab_helper.h | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/browser/brave_ads/ads_tab_helper.cc b/browser/brave_ads/ads_tab_helper.cc index ba6be207427..39b00ca7169 100644 --- a/browser/brave_ads/ads_tab_helper.cc +++ b/browser/brave_ads/ads_tab_helper.cc @@ -138,7 +138,8 @@ void AdsTabHelper::DidFinishNavigation( RunIsolatedJavaScript(render_frame_host); } -void AdsTabHelper::DocumentOnLoadCompletedInMainFrame() { +void AdsTabHelper::DocumentOnLoadCompletedInMainFrame( + content::RenderFrameHost* render_frame_host) { if (!IsAdsEnabled() || !should_process_) { return; } @@ -147,9 +148,6 @@ void AdsTabHelper::DocumentOnLoadCompletedInMainFrame() { std::make_unique( web_contents(), false); - content::RenderFrameHost* render_frame_host = - handle->web_contents()->GetMainFrame(); - RunIsolatedJavaScript(render_frame_host); } diff --git a/browser/brave_ads/ads_tab_helper.h b/browser/brave_ads/ads_tab_helper.h index 18889abd994..20748f0a7a1 100644 --- a/browser/brave_ads/ads_tab_helper.h +++ b/browser/brave_ads/ads_tab_helper.h @@ -68,7 +68,8 @@ class AdsTabHelper : public content::WebContentsObserver, // content::WebContentsObserver overrides void DidFinishNavigation( content::NavigationHandle* navigation_handle) override; - void DocumentOnLoadCompletedInMainFrame() override; + void DocumentOnLoadCompletedInMainFrame( + content::RenderFrameHost* render_frame_host) override; void DidFinishLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url) override; void MediaStartedPlaying(const MediaPlayerInfo& video_type, From bd1916ee534c1992278918bb8233cfe480bf8ca0 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 8 Mar 2021 16:23:47 +0100 Subject: [PATCH 009/141] Rename overriden methods from TranslateBubbleModel in mock subclass Three virtual methods have been renamed in the superclass, so we need to update MockTranslateBubbleModel now. Chromium changes: https://source.chromium.org/chromium/chromium/src/+/3c90e3b11ba60e218b9f1cf678f4a98cc5443a1b commit 3c90e3b11ba60e218b9f1cf678f4a98cc5443a1b Author: Anthony Cui Date: Mon Mar 1 21:36:46 2021 +0000 [Translate] Update use of term "original language" to "source language" This change focuses on resolving inconsistency in naming in the translate bubble view and infobar. Other areas of the code may still use the "original language" terminology. Overview of the scope of this change: Renames all usages of term "original language" in - TranslateUIDelegate code - TranslateBubbleModel code - TranslateBubbleView code - TranslateInfoBarDelegate code - TranslateCompactInfoBar code - iOS infobar code that uses the infobar delegate Bug: 1179823 --- .../views/translate/brave_translate_bubble_view_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc b/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc index 4bacbb57788..33fd6e76668 100644 --- a/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc +++ b/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc @@ -61,15 +61,15 @@ class MockTranslateBubbleModel : public TranslateBubbleModel { return base::ASCIIToUTF16("Spanish"); } - std::string GetOriginalLanguageCode() const override { + std::string GetSourceLanguageCode() const override { return std::string("en-US"); } - int GetOriginalLanguageIndex() const override { + int GetSourceLanguageIndex() const override { return original_language_index_; } - void UpdateOriginalLanguageIndex(int index) override { + void UpdateSourceLanguageIndex(int index) override { original_language_index_ = index; } From e1ab78f65a9538fad868f3db738a5c1d8c3fbae9 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 8 Mar 2021 11:10:52 -0500 Subject: [PATCH 010/141] [Android] Use PendingIntentProvider for notification actions Chromium change: https://chromium.googlesource.com/chromium/src.git/+/abc61e532741e260858eb99afef15fff30a63019 Use PendingIntentProvider for notification actions The web notification settings button did not specify the required mutability flags on Android S. This now changes the interface of NotificationBuilderBase to use PendingIntentProvider instead of plain PendingIntents so we can make sure that we always set the expected flags. Bug: 1163529 --- .../browser/notifications/BraveAdsNotificationBuilder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java index bc6b8db44fc..6293d43d032 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java @@ -33,6 +33,7 @@ import org.chromium.chrome.browser.notifications.channels.BraveChannelDefinition import org.chromium.components.browser_ui.notifications.NotificationMetadata; import org.chromium.components.browser_ui.notifications.NotificationWrapper; import org.chromium.components.browser_ui.notifications.NotificationWrapperBuilder; +import org.chromium.components.browser_ui.notifications.PendingIntentProvider; /** * Builds a notification according to BraveAds spec. @@ -189,7 +190,7 @@ public class BraveAdsNotificationBuilder extends NotificationBuilderBase { @Override public NotificationBuilderBase addButtonAction(@Nullable Bitmap iconBitmap, - @Nullable CharSequence title, @Nullable PendingIntent intent) { + @Nullable CharSequence title, PendingIntentProvider intent) { return this; } @@ -200,13 +201,13 @@ public class BraveAdsNotificationBuilder extends NotificationBuilderBase { */ @Override public NotificationBuilderBase addTextAction(@Nullable Bitmap iconBitmap, - @Nullable CharSequence title, @Nullable PendingIntent intent, String placeholder) { + @Nullable CharSequence title, PendingIntentProvider intent, String placeholder) { return this; } @Override public NotificationBuilderBase addSettingsAction( - int iconId, @Nullable CharSequence title, @Nullable PendingIntent intent) { + int iconId, @Nullable CharSequence title, PendingIntentProvider intent) { return this; } From ebb792e05fef52a682027f9651bb493874192af8 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 8 Mar 2021 11:16:01 -0500 Subject: [PATCH 011/141] [Android] LanguageSettings were modularized The only reason we used BravePreferenceFragment is to have a close button in the settings. This will be re-done in the context of this issue https://github.com/brave/brave-browser/issues/10375 Chromium change: https://chromium.googlesource.com/chromium/src.git/+/f3c257e9298faf4da38daa674571c7ad08873106 [Android] Move LanguageSettings to //chrome/browser/language This CL moves LangaugeSettings.java and the associated XML files out of //chrome/android to the //chrome/browser/language module. There are no UI changes from this CL. A follow up CL will move the language related tests to //chrome/browser/language. Bug: 1124096 --- ...er-language-settings-LanguageSettings.java.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch diff --git a/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch b/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch deleted file mode 100644 index 6ac4e186e34..00000000000 --- a/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -index 2de272e8e851996eeb823a09fc650237cd169c02..f81c3c5034b389ba09398c2590786587dd7dd113 100644 ---- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -@@ -37,7 +37,7 @@ import java.util.Collection; - * Settings fragment that displays information about Chrome languages, which allow users to - * seamlessly find and manage their languages preferences across platforms. - */ --public class LanguageSettings extends PreferenceFragmentCompat -+public class LanguageSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment - implements AddLanguageFragment.Launcher, FragmentSettingsLauncher { - // Default number of items to list in a collection preference summary. - private static final int COLLECTION_SUMMARY_ITEM_LIMIT = 3; From c6b92b2330f8415055097b9847b264b8ddffd00c Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 8 Mar 2021 11:28:45 -0500 Subject: [PATCH 012/141] [Android] GetNativeTheme implementation was changed Chromium change: https://chromium.googlesource.com/chromium/src.git/+/8e00960d380b79da137b8a674c2c860361011502 Reland "Fix color access in cbui/webui" This is a reland of 41fb0c7f80ca8409c06bfd85745293465d645adc On slow machines, WebContents::Getter::Run() might return nullptr because the renderer is not yet initialized. To handle this case, remove the DCHECK from webui::GetNativeTheme(WebContents*) and return the fallback global NativeTheme. Original change's description: > Fix color access in cbui/webui > > Remove most usages of the static NativeTheme::GetInstanceForNativeUi() > by searching for the NativeTheme of a BrowserView or a Widget > containing the WebContents of the WebUI. > > There're two remaining cases: > - When the singleton NativeTheme is used in a observer and there is no > associating WebContents, e.g. in a KeyedService. > - In tests where the WebContents may not be contained in a Browser or a > Widget. > > Bug: 1056916 --- .../chrome/browser/ui/webui/favicon_source.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/chromium_src/chrome/browser/ui/webui/favicon_source.cc b/chromium_src/chrome/browser/ui/webui/favicon_source.cc index 8141d743f02..a0d009fab4f 100644 --- a/chromium_src/chrome/browser/ui/webui/favicon_source.cc +++ b/chromium_src/chrome/browser/ui/webui/favicon_source.cc @@ -9,7 +9,6 @@ #if defined(OS_ANDROID) #include "ui/native_theme/native_theme.h" -#define GetInstanceForNativeUi BraveGetInstanceForNativeUi #define IDR_DEFAULT_FAVICON_32 IDR_DEFAULT_FAVICON #define IDR_DEFAULT_FAVICON_64 IDR_DEFAULT_FAVICON #define IDR_DEFAULT_FAVICON_DARK_32 IDR_DEFAULT_FAVICON_DARK @@ -66,6 +65,17 @@ class InstantService { return false; } }; + +// Toolkit views are not enabled for Android, so just fallback to what we had +// before the change. +#if !defined(TOOLKIT_VIEWS) +namespace webui { +ui::NativeTheme* GetNativeTheme(content::WebContents* web_contents) { + return ui::NativeTheme::BraveGetInstanceForNativeUi(); +} +} // namespace webui +#endif // !defined(TOOLKIT_VIEWS) + #endif // #if defined(OS_ANDROID) #include "../../../../../../chrome/browser/ui/webui/favicon_source.cc" From 060f82e11d55c6b27007c645700114039ca7c95e Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 8 Mar 2021 12:59:39 -0500 Subject: [PATCH 013/141] [Android] SAFETY_CHECK_ANDROID feature was removed Chromium change: https://chromium.googlesource.com/chromium/src.git/+/d01674ab74e6f9a8379d43347fee21de0c1f8668 Safety Check on Android: removed the feature flag and cleaned up unused codepaths Bug: 1070620 --- .../safety_check/BraveSafetyCheckSettingsFragmentTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/android/javatests/org/chromium/chrome/browser/safety_check/BraveSafetyCheckSettingsFragmentTest.java b/android/javatests/org/chromium/chrome/browser/safety_check/BraveSafetyCheckSettingsFragmentTest.java index 1362beb4c38..c6bb6cc5e67 100644 --- a/android/javatests/org/chromium/chrome/browser/safety_check/BraveSafetyCheckSettingsFragmentTest.java +++ b/android/javatests/org/chromium/chrome/browser/safety_check/BraveSafetyCheckSettingsFragmentTest.java @@ -15,7 +15,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.settings.SettingsActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.util.browser.Features; @@ -24,7 +23,6 @@ import org.chromium.chrome.test.util.browser.Features; // Main purpose of these tests id to detect that something new, that we may consider valuable, is // appeared in this section . @RunWith(ChromeJUnit4ClassRunner.class) -@Features.EnableFeatures(ChromeFeatureList.SAFETY_CHECK_ANDROID) public class BraveSafetyCheckSettingsFragmentTest { private static final String PASSWORDS = "passwords"; private static final String SAFE_BROWSING = "safe_browsing"; From a443dccb630b3e3024ed7dbd0cc309776170973b Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 11 Mar 2021 11:41:02 +0100 Subject: [PATCH 014/141] Rename locales_with_fake_bidi to locales_with_pseudolocales Need to adapt to the renaming in upstream's code. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/4f924e3bb21e4aa99df6242d672a9dcf52fdd514 commit 4f924e3bb21e4aa99df6242d672a9dcf52fdd514 Author: Matt Stark Date: Wed Mar 10 21:30:34 2021 +0000 Rename locales_with_fake_bidi to locales_with_pseudolocales. This will reflect the changes in the contents of the variable. BUG=chromium:1173812 --- app/BUILD.gn | 2 +- components/resources/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/BUILD.gn b/app/BUILD.gn index 29b42e014f4..bf8b760048b 100644 --- a/app/BUILD.gn +++ b/app/BUILD.gn @@ -18,7 +18,7 @@ grit("brave_generated_resources_grit") { "brave_generated_resources.pak", ] - foreach(locale, locales_with_fake_bidi) { + foreach(locale, locales_with_pseudolocales) { outputs += [ "brave_generated_resources_$locale.pak" ] } diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn index 611f0724261..a0d4ff16b26 100644 --- a/components/resources/BUILD.gn +++ b/components/resources/BUILD.gn @@ -111,7 +111,7 @@ grit("strings") { "enable_sidebar=$enable_sidebar", ] - foreach(locale, locales_with_fake_bidi) { + foreach(locale, locales_with_pseudolocales) { outputs += [ "brave_components_strings_$locale.pak" ] } From 2e8d29ca1c925602cd0f03ab3f423c2c538ad40d Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 11 Mar 2021 11:52:21 +0100 Subject: [PATCH 015/141] Remove override of no longer existent constant from chrome_constants.cc Chromium change: https://chromium.googlesource.com/chromium/src.git/+/6132d6e7f9220b133054b63a1bdea03c3520e872 commit 6132d6e7f9220b133054b63a1bdea03c3520e872 Author: Colin Blundell Date: Mon Mar 8 10:42:43 2021 +0000 [Ad interventions] Internalize heavy ad features and constants This CL moves definitions of heavy ad features and constants out of generic //chrome files and into //c/b/heavy_ad_interventions itself in preparation for componentization of this code. Bug: 1116095 --- chromium_src/chrome/common/chrome_constants.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/chromium_src/chrome/common/chrome_constants.cc b/chromium_src/chrome/common/chrome_constants.cc index 3c28d073110..104c1a0694a 100644 --- a/chromium_src/chrome/common/chrome_constants.cc +++ b/chromium_src/chrome/common/chrome_constants.cc @@ -111,8 +111,6 @@ const base::FilePath::CharType kFeatureEngagementTrackerStorageDirname[] = FPL("Feature Engagement Tracker"); const base::FilePath::CharType kFirstRunSentinel[] = FPL("First Run"); const base::FilePath::CharType kGCMStoreDirname[] = FPL("GCM Store"); -const base::FilePath::CharType kHeavyAdInterventionOptOutDBFilename[] = - FPL("heavy_ad_intervention_opt_out.db"); const base::FilePath::CharType kLocalStateFilename[] = FPL("Local State"); const base::FilePath::CharType kMediaCacheDirname[] = FPL("Media Cache"); const base::FilePath::CharType kNetworkPersistentStateFilename[] = From 1cf7cf6ad299ec11d4877477a0689c373580b32f Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 11 Mar 2021 12:26:10 +0100 Subject: [PATCH 016/141] Replace usage of base::char16 with char16_t, following upstream's lead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chromium change: https://chromium.googlesource.com/chromium/src.git/+/677e0c87cbbc129eb8b65c47036b19292c725127 commit 677e0c87cbbc129eb8b65c47036b19292c725127 Author: Jan Wilken Dörrie Date: Wed Mar 10 10:04:38 2021 +0000 [LSC] Remove base::char16 type alias This change removes the base::char16 type alias and replaces remaining usages with char16_t. Bug: 1184339 --- browser/download/brave_download_item_model.cc | 2 +- browser/ui/views/download/brave_download_item_view.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/download/brave_download_item_model.cc b/browser/download/brave_download_item_model.cc index 0056dc6d24a..6af4c0c8fa6 100644 --- a/browser/download/brave_download_item_model.cc +++ b/browser/download/brave_download_item_model.cc @@ -38,7 +38,7 @@ base::string16 BraveDownloadItemModel::GetTooltipText() { tooltip += base::ASCIIToUTF16("\n"); if (!is_secure) { tooltip += l10n_util::GetStringUTF16(IDS_NOT_SECURE_VERBOSE_STATE) + - base::char16(' '); + char16_t(' '); } tooltip += origin_url; } diff --git a/browser/ui/views/download/brave_download_item_view.cc b/browser/ui/views/download/brave_download_item_view.cc index 0ecb46b6b41..39972c33386 100644 --- a/browser/ui/views/download/brave_download_item_view.cc +++ b/browser/ui/views/download/brave_download_item_view.cc @@ -232,9 +232,9 @@ void BraveDownloadItemView::SetMode(Mode mode) { if (!origin_url_text_.empty()) { base::string16 extra; if (!is_origin_url_secure_) - extra += base::char16(' ') - + l10n_util::GetStringUTF16(IDS_NOT_SECURE_VERBOSE_STATE); - extra += base::char16(' ') + origin_url_text_; + extra += char16_t(' ') + + l10n_util::GetStringUTF16(IDS_NOT_SECURE_VERBOSE_STATE); + extra += char16_t(' ') + origin_url_text_; accessible_name_ += extra; } } From a3af6c109e4822bf944f37c5b77df21a3b1c59fb Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 11 Mar 2021 13:49:01 +0100 Subject: [PATCH 017/141] Adapt chromium_src overrides for channel_info_*.cc specializations A new parameter has been added to GetChannelName() and a new function IsExtendedStableChannel() has been added to channel_info.h to cover the recently announced stable channel of Chrome upstream, so we need to adapt over overrides for that. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/d5421411028157496c2bc0b9e33f26591ebf067a commit d5421411028157496c2bc0b9e33f26591ebf067a Author: Greg Thompson Date: Mon Mar 8 21:23:37 2021 +0000 Introduce the concept of the "extended stable" channel. The Extended Stable channel is a new update channel for desktop Google Chrome browser with a longer release cadence than regular stable. By and large, installations that follow this update channel act just like an installation that follows the regular stable update channel. To allow certain UX surfaces (largely diagnostic), usage stats, and crash reports to distinguish one type of stable from the other, chrome::GetChannelName and chrome::GetVersionString now take a boolean arg that means "include extended somehow in the return value". For the moment, the default is false. Subsequent CLs will migrate all callers of these functions to specify one option or the other (hide/surface extended stable). Once that's done, the default will be removed so that authors of future code will be forced to consider which option is the right one for their specific use case. Independent CLs will implement per-platform detection of the new channel so that GetChannelName and GetVersionString include "extended" somehow when appropriate. Bug: 1185621 --- chromium_src/chrome/common/channel_info_mac.mm | 7 ++++++- chromium_src/chrome/common/channel_info_posix.cc | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/chromium_src/chrome/common/channel_info_mac.mm b/chromium_src/chrome/common/channel_info_mac.mm index 36b96adf0bf..411cafbf939 100644 --- a/chromium_src/chrome/common/channel_info_mac.mm +++ b/chromium_src/chrome/common/channel_info_mac.mm @@ -14,7 +14,7 @@ namespace chrome { -std::string GetChannelName() { +std::string GetChannelName(WithExtendedStable with_extended_stable) { #if defined(OFFICIAL_BUILD) static const base::NoDestructor channel([] { // Use the main Chrome application bundle and not the framework bundle. @@ -66,4 +66,9 @@ version_info::Channel GetChannel() { return GetChannelByName(GetChannelName()); } +bool IsExtendedStableChannel() { + // No extended stable channel for Brave. + return false; +} + } // namespace chrome diff --git a/chromium_src/chrome/common/channel_info_posix.cc b/chromium_src/chrome/common/channel_info_posix.cc index 860d4f9567c..7f547708c9b 100644 --- a/chromium_src/chrome/common/channel_info_posix.cc +++ b/chromium_src/chrome/common/channel_info_posix.cc @@ -12,7 +12,7 @@ namespace chrome { -std::string GetChannelName() { +std::string GetChannelName(WithExtendedStable with_extended_stable) { std::string modifier; brave::GetChannelImpl(&modifier, nullptr); return modifier; @@ -51,4 +51,9 @@ version_info::Channel GetChannel() { return brave::GetChannelImpl(nullptr, nullptr); } +bool IsExtendedStableChannel() { + // No extended stable channel for Brave. + return false; +} + } // namespace chrome From a0913453e9719f0688e582fcc6e17ae2e5c32517 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 11 Mar 2021 13:58:42 +0100 Subject: [PATCH 018/141] Adapt component_installer.{h,cc} override to the new Register() method There are now two Register() methods in ComponentInstaller class, so we need to adapt slightly the override to preserve the same behaviour. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/7f2e1d80cf5d3886dfe31ed9936f4ab57b14745d commit 7f2e1d80cf5d3886dfe31ed9936f4ab57b14745d Author: Mugdha Lakhani Date: Mon Mar 8 18:25:35 2021 +0000 [ComponentUpdater] Add a new Register method. Add a new Register method to ComponentInstaller. This will allow WebView code to register components without taking a dependency on ComponentUpdateService. Bug: 1183497 --- .../components/component_updater/DEPS | 1 + .../component_updater/component_installer.cc | 12 +++++++++- .../component_updater/component_installer.h | 22 ++++++++++++++----- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/chromium_src/components/component_updater/DEPS b/chromium_src/components/component_updater/DEPS index 5f17b14c6ea..d13d4bed5c5 100644 --- a/chromium_src/components/component_updater/DEPS +++ b/chromium_src/components/component_updater/DEPS @@ -2,4 +2,5 @@ include_rules = [ "+../../../../components/component_updater", "+components/component_updater", "+components/crx_file", + "+components/update_client", ] diff --git a/chromium_src/components/component_updater/component_installer.cc b/chromium_src/components/component_updater/component_installer.cc index dc09bd89c09..3d25c235441 100644 --- a/chromium_src/components/component_updater/component_installer.cc +++ b/chromium_src/components/component_updater/component_installer.cc @@ -18,6 +18,15 @@ namespace component_updater { void ComponentInstaller::Register(ComponentUpdateService* cus, base::OnceClosure callback) { + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); + DCHECK(cus); + Register(base::BindOnce(&ComponentUpdateService::RegisterComponent, + base::Unretained(cus)), + std::move(callback)); +} + +void ComponentInstaller::Register(RegisterCallback register_callback, + base::OnceClosure callback) { static std::string disallowed_components[] = { "bklopemakmnopmghhmccadeonafabnal", // Legacy TLS Deprecation Config "cmahhnpholdijhjokonmfdjbfmklppij", // Federated Learning of Cohorts @@ -41,7 +50,8 @@ void ComponentInstaller::Register(ComponentUpdateService* cus, return; } } - Register_ChromiumImpl(cus, std::move(callback)); + Register_ChromiumImpl(std::move(register_callback), std::move(callback)); } + } // namespace component_updater diff --git a/chromium_src/components/component_updater/component_installer.h b/chromium_src/components/component_updater/component_installer.h index b29554cb500..7f917185aa6 100644 --- a/chromium_src/components/component_updater/component_installer.h +++ b/chromium_src/components/component_updater/component_installer.h @@ -6,11 +6,23 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_COMPONENT_UPDATER_COMPONENT_INSTALLER_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_COMPONENT_UPDATER_COMPONENT_INSTALLER_H_ -#define Register \ - Register_ChromiumImpl(ComponentUpdateService* cus, \ - base::OnceClosure callback); \ - void Register +// Prevent CrxInstaller::OnUpdateError from being redefined by the below +// #define. +#include "components/update_client/update_client.h" + +// We can't redefine Register() here because that would change two methods at +// the same time. Instead, we leverage OnUpdateError() void method to inject +// the declarations of Register_ChromiumImpl that are defined in the override +// for component_installer.cc, so that we can still compile and link. +#define OnUpdateError \ + Register_ChromiumImpl(ComponentUpdateService* cus, \ + base::OnceClosure callback); \ + void Register_ChromiumImpl(RegisterCallback register_callback, \ + base::OnceClosure callback); \ + void OnUpdateError + #include "../../../../components/component_updater/component_installer.h" -#undef Register + +#undef OnUpdateError #endif // BRAVE_CHROMIUM_SRC_COMPONENTS_COMPONENT_UPDATER_COMPONENT_INSTALLER_H_ From f9fcefaa0c3d75153622485d1280cc4146fd0075 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 12 Mar 2021 12:23:00 +0100 Subject: [PATCH 019/141] Migrate legacy HTML imports to Javascript modules This was breaking optimized (e.g. Component) builds due to causing the generated code to refer to no longer existing *.m.js files, instead of the *.js ones, and was causing brave://settings to show up completely broken (i.e. empty) due to the same problem (although in that case the non existent files were detected at runtime, as there's no JS rollup). This small patch migrates those conflictive HTML imports into including Javascript modules, and also fixes the remaining cases in non-generated JS code that were still referring to *.m.js files instead of *.js ones. --- .../brave_default_extensions_page.html | 6 +++--- .../brave_help_tips_page/brave_help_tips_page.html | 4 ++-- .../settings/brave_ipfs_page/brave_ipfs_page.html | 6 +++--- .../settings/brave_new_tab_page/brave_new_tab_page.html | 4 ++-- .../brave_privacy_page/brave_personalization_options.html | 4 ++-- .../resources/settings/brave_sync_page/brave_sync_page.js | 4 ++-- .../settings/brave_wallet_page/brave_wallet_page.html | 8 ++++---- .../default_brave_shields_page.html | 4 ++-- .../settings/getting_started_page/getting_started.js | 2 +- .../social_blocking_page/social_blocking_page.html | 4 ++-- ...-resources-settings-privacy_page-privacy_page.js.patch | 4 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html index 2a77a64a6cb..e363a7ea5be 100644 --- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html +++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html @@ -5,9 +5,9 @@ - - - + + +