From 258324ba3e1851debb27efa1e9fcd120731d0c7c Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Wed, 17 Apr 2019 15:50:03 -0400 Subject: [PATCH] Updating patches from Chromium 74.0.3729.75 to Chromium 74.0.3729.91 --- patches/chrome-VERSION.patch | 4 +-- patches/chrome-browser-about_flags.cc.patch | 2 +- ...r-extensions-extension_management.cc.patch | 4 +-- ...ser-global_keyboard_shortcuts_mac.mm.patch | 2 +- ...-notification_platform_bridge_mac.mm.patch | 2 +- patches/chrome-browser-ui-browser.cc.patch | 13 -------- ...hrome-browser-ui-browser_commands.cc.patch | 13 -------- .../chrome-browser-ui-browser_window.h.patch | 13 -------- ...owser-ui-cocoa-accelerators_cocoa.mm.patch | 2 +- ...owser-ui-location_bar-location_bar.h.patch | 13 ++------ ...owser-ui-views-frame-browser_view.cc.patch | 22 ------------- ...rowser-ui-views-frame-browser_view.h.patch | 13 -------- ...ws-location_bar-location_bar_view.cc.patch | 33 ++----------------- ...ews-location_bar-location_bar_view.h.patch | 11 +------ ...ser-ui-views-toolbar-toolbar_view.cc.patch | 13 -------- ...rome-test-base-test_browser_window.h.patch | 22 ------------- ...ts-crash-content-app-crashpad_mac.mm.patch | 2 +- ...ts-os_crypt-keychain_password_mac.mm.patch | 4 +-- .../components-os_crypt-os_crypt_mac.mm.patch | 2 +- ...ser-frame_host-navigation_request.cc.patch | 4 +-- ...nt-browser-storage_partition_impl.cc.patch | 6 ++-- ...r-api-web_request-web_request_api.cc.patch | 4 +-- .../ui-native_theme-native_theme_mac.mm.patch | 2 +- 23 files changed, 26 insertions(+), 180 deletions(-) delete mode 100644 patches/chrome-browser-ui-browser.cc.patch delete mode 100644 patches/chrome-browser-ui-browser_commands.cc.patch delete mode 100644 patches/chrome-browser-ui-browser_window.h.patch delete mode 100644 patches/chrome-browser-ui-views-frame-browser_view.cc.patch delete mode 100644 patches/chrome-browser-ui-views-frame-browser_view.h.patch delete mode 100644 patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch delete mode 100644 patches/chrome-test-base-test_browser_window.h.patch diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 2e6c3cd7775f..8e6b2a672a55 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 3c26e3145cfbeb4928c98357912c90b7b6c4f669..08d2fac4f5c3d6a93e87a930d5eaeb85183e2c00 100644 +index 70a7f301d7bece4a07e3ca09c510a29e72975f6b..38de829ed56f64dbbc4c69eae62defacd9b7151c 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=74 MINOR=0 -BUILD=3729 --PATCH=75 +-PATCH=91 +BUILD=65 +PATCH=65 diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 1adb7f050c44..5354c2941831 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 1289e25873618f2f1bc83ebd4edce1ae944b30ca..81d3ad899fcb2daac88375d84e58d71e91fecb7e 100644 +index 4db65beb6d67f3c1b931bed034b3d6e73a2b1740..75b17aec293162db96781aa2a2b139ea51ea0745 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -261,14 +261,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 0fa553127fd6..ffb710b64be9 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 f4aa45be45b68ba4026f287d42c9a8e13ef824d2..2cf227f16e8d9e2c7c944ed60ff133630acdcaa0 100644 +index cab990306e159f6b2b81672f69a828ef5661742b..8d2ffe3ab7889c4489118b11c58c045c505ab102 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -15,6 +15,7 @@ @@ -10,7 +10,7 @@ index f4aa45be45b68ba4026f287d42c9a8e13ef824d2..2cf227f16e8d9e2c7c944ed60ff13363 #include "chrome/browser/extensions/extension_management_constants.h" #include "chrome/browser/extensions/extension_management_internal.h" #include "chrome/browser/extensions/external_policy_loader.h" -@@ -601,7 +602,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -608,7 +609,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch index 6f4d4992256c..d6c50b7274c8 100644 --- a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch +++ b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/gl index 733785418f6e0fd4090f2c5b82517d01982ab8a5..7b8a57bc712fe2ff3c82ad35f8261cc5451afea0 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm -@@ -166,6 +166,7 @@ CommandForKeyEventResult ShortcutCommand(int cmd) { +@@ -166,6 +166,7 @@ const std::vector& GetShortcutsNotPresentInMainMenu() { {true, false, false, true, kVK_ANSI_L, IDC_SHOW_DOWNLOADS}, {true, true, false, false, kVK_ANSI_C, IDC_DEV_TOOLS_INSPECT}, {true, false, false, true, kVK_ANSI_C, IDC_DEV_TOOLS_INSPECT}, 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 7282c8040618..77b5eff424be 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/ index 08078c5f168ebf562fd19c0ebd621f1f7a5a6b5d..8bcd16b11888402fa48926564e13f78657442a05 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm -@@ -226,6 +226,7 @@ @interface AlertDispatcherImpl : NSObject +@@ -226,6 +226,7 @@ void NotificationPlatformBridgeMac::Display( initWithCloseLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_CLOSE) optionsLabel:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_MORE) settingsLabel:l10n_util::GetNSString( diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch deleted file mode 100644 index cfa4d6621a19..000000000000 --- a/patches/chrome-browser-ui-browser.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 939a669e01d34f83247786cd0a940cbc93cdc6f1..0a66f41df4fd551f907b4b4cadc4e7dda9dbe7e6 100644 ---- a/chrome/browser/ui/browser.cc -+++ b/chrome/browser/ui/browser.cc -@@ -1121,7 +1121,7 @@ void Browser::SetFocusToLocationBar() { - // the focus. FocusLocationBar() is only reached when the location bar is - // focusable, but this may be reached at other times, e.g. while in - // fullscreen mode, where we need to leave focus in a consistent state. -- window_->SetFocusToLocationBar(); -+ window_->SetFocusToLocationBar(false); - } - - content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( diff --git a/patches/chrome-browser-ui-browser_commands.cc.patch b/patches/chrome-browser-ui-browser_commands.cc.patch deleted file mode 100644 index 5178230fb208..000000000000 --- a/patches/chrome-browser-ui-browser_commands.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc -index 662ff6224d64249902fac4099b4326df83149997..c2cdd1def36a20747b9b9d056bbf26432926178e 100644 ---- a/chrome/browser/ui/browser_commands.cc -+++ b/chrome/browser/ui/browser_commands.cc -@@ -1105,7 +1105,7 @@ void FocusToolbar(Browser* browser) { - - void FocusLocationBar(Browser* browser) { - base::RecordAction(UserMetricsAction("FocusLocation")); -- browser->window()->SetFocusToLocationBar(); -+ browser->window()->SetFocusToLocationBar(true); - } - - void FocusSearch(Browser* browser) { diff --git a/patches/chrome-browser-ui-browser_window.h.patch b/patches/chrome-browser-ui-browser_window.h.patch deleted file mode 100644 index 49b28c07e5fa..000000000000 --- a/patches/chrome-browser-ui-browser_window.h.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h -index 3f42805e9b42a5bf104b8b37c4fe6e20dbb777e6..f5c499c8c37645888764c79dedbfcfc62c02f408 100644 ---- a/chrome/browser/ui/browser_window.h -+++ b/chrome/browser/ui/browser_window.h -@@ -241,7 +241,7 @@ class BrowserWindow : public ui::BaseWindow { - - // Tries to focus the location bar. Clears the window focus (to avoid - // inconsistent state) if this fails. -- virtual void SetFocusToLocationBar() = 0; -+ virtual void SetFocusToLocationBar(bool select_all) = 0; - - // Informs the view whether or not a load is in progress for the current tab. - // The view can use this notification to update the reload/stop button. diff --git a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch index 9f81c4ff29ff..48c61e264348 100644 --- a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch +++ b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/c index 37baab628592ff2a2ee93f8af0c2e687d35bab42..2145c7b6463628dcea7e0a8b4826d90e00b251d0 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm -@@ -40,6 +40,8 @@ +@@ -40,6 +40,8 @@ const struct AcceleratorMapping { ui::VKEY_N}, {IDC_NEW_TAB, ui::EF_COMMAND_DOWN, ui::VKEY_T}, {IDC_NEW_WINDOW, ui::EF_COMMAND_DOWN, ui::VKEY_N}, diff --git a/patches/chrome-browser-ui-location_bar-location_bar.h.patch b/patches/chrome-browser-ui-location_bar-location_bar.h.patch index 9dec98543070..7ffd28c9c264 100644 --- a/patches/chrome-browser-ui-location_bar-location_bar.h.patch +++ b/patches/chrome-browser-ui-location_bar-location_bar.h.patch @@ -1,17 +1,8 @@ diff --git a/chrome/browser/ui/location_bar/location_bar.h b/chrome/browser/ui/location_bar/location_bar.h -index 239d3bac4ecff88a3a12b5cc6cf1c2fa8ff0c500..070bacb8c9cf9e832bb2358deb62f678f41c33c3 100644 +index c4a0819a49d4e2e8ef6fd4ca580679517116cf61..23c35dcdf6b57f089349ea5f0253df5ca1eeeda4 100644 --- a/chrome/browser/ui/location_bar/location_bar.h +++ b/chrome/browser/ui/location_bar/location_bar.h -@@ -45,7 +45,7 @@ class LocationBar { - virtual void AcceptInput(base::TimeTicks match_selection_timestamp) = 0; - - // Focuses the location bar and selects its contents. -- virtual void FocusLocation() = 0; -+ virtual void FocusLocation(bool select_all) = 0; - - // Puts the user into keyword mode with their default search provider. - virtual void FocusSearch() = 0; -@@ -81,7 +81,7 @@ class LocationBar { +@@ -89,7 +89,7 @@ class LocationBar { virtual ~LocationBar(); // Checks if any extension has requested that the bookmark star be hidden. diff --git a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch b/patches/chrome-browser-ui-views-frame-browser_view.cc.patch deleted file mode 100644 index 9c78f3eab29d..000000000000 --- a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc -index 5d0eb9abffb86b584d96b89feec0b25119b883e7..ddf77fc72f61c9c9f18648410c0972795d89c4a1 100644 ---- a/chrome/browser/ui/views/frame/browser_view.cc -+++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -1121,7 +1121,7 @@ LocationBar* BrowserView::GetLocationBar() const { - return GetLocationBarView(); - } - --void BrowserView::SetFocusToLocationBar() { -+void BrowserView::SetFocusToLocationBar(bool select_all) { - // On Windows, changing focus to the location bar causes the browser window to - // become active. This can steal focus if the user has another window open - // already. On Chrome OS, changing focus makes a view believe it has a focus -@@ -1133,7 +1133,7 @@ void BrowserView::SetFocusToLocationBar() { - #endif - - LocationBarView* location_bar = GetLocationBarView(); -- location_bar->FocusLocation(); -+ location_bar->FocusLocation(select_all); - if (!location_bar->omnibox_view()->HasFocus()) { - // If none of location bar got focus, then clear focus. - views::FocusManager* focus_manager = GetFocusManager(); diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch deleted file mode 100644 index f24b36f6f222..000000000000 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index 417ba26f75d9637856ace03b791b4fd6b5aad822..2c35cf8efc2785ef96e7ef5650ea1624b675082d 100644 ---- a/chrome/browser/ui/views/frame/browser_view.h -+++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -341,7 +341,7 @@ class BrowserView : public BrowserWindow, - bool IsFullscreenBubbleVisible() const override; - PageActionIconContainer* GetPageActionIconContainer() override; - LocationBar* GetLocationBar() const override; -- void SetFocusToLocationBar() override; -+ void SetFocusToLocationBar(bool select_all) override; - void UpdateReloadStopState(bool is_loading, bool force) override; - void UpdateToolbar(content::WebContents* contents) override; - void UpdateToolbarVisibility(bool visible, bool animate) override; 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 02ac0af96771..92800344fbdb 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,26 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 10bea76273f59c769553722bc2070850ed872d6b..eee3a12ac8dbc2f7c4cf868b27a86271aa6b5522 100644 +index 737564115cf7bef246a40ed08f249bd5de721db5..f3b56352c461b93a86e1474cd730bad389f18b61 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -337,13 +337,16 @@ void LocationBarView::SelectAll() { - //////////////////////////////////////////////////////////////////////////////// - // LocationBarView, public LocationBar implementation: - --void LocationBarView::FocusLocation() { -+void LocationBarView::FocusLocation(bool select_all) { - const bool omnibox_already_focused = omnibox_view_->HasFocus(); - - omnibox_view_->SetFocus(); - if (omnibox_already_focused) - omnibox_view()->model()->ClearKeyword(); - -+ if (!select_all) -+ return; -+ - omnibox_view_->SelectAll(true); - - // Only exit Query in Omnibox mode on focus command if the location bar was -@@ -424,7 +427,7 @@ gfx::Size LocationBarView::CalculatePreferredSize() const { +@@ -428,7 +428,7 @@ gfx::Size LocationBarView::CalculatePreferredSize() const { return gfx::Size(width, height); } @@ -29,7 +11,7 @@ index 10bea76273f59c769553722bc2070850ed872d6b..eee3a12ac8dbc2f7c4cf868b27a86271 if (!IsInitialized()) return; -@@ -517,6 +520,11 @@ void LocationBarView::Layout() { +@@ -521,6 +521,11 @@ void LocationBarView::Layout() { } }; @@ -41,12 +23,3 @@ index 10bea76273f59c769553722bc2070850ed872d6b..eee3a12ac8dbc2f7c4cf868b27a86271 if (star_view_) add_trailing_decoration(star_view_); add_trailing_decoration(page_action_icon_container_view_); -@@ -1186,7 +1194,7 @@ void LocationBarView::OnOmniboxHovered(bool is_hovering) { - // LocationBarView, private DropdownBarHostDelegate implementation: - - void LocationBarView::FocusAndSelectAll() { -- FocusLocation(); -+ FocusLocation(true); - } - - //////////////////////////////////////////////////////////////////////////////// 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 18d14f976947..740b6495aa03 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 7550088b46f3cb5a731c10f680fd47c42fc12746..3e5b98d09c7477a09fd0a31d38ab8f3a76f8b31e 100644 +index dc4a46b001d5c92209a6072b763c97f9fde82cf6..3e5b98d09c7477a09fd0a31d38ab8f3a76f8b31e 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -114,6 +114,7 @@ class LocationBarView : public LocationBar, @@ -18,15 +18,6 @@ index 7550088b46f3cb5a731c10f680fd47c42fc12746..3e5b98d09c7477a09fd0a31d38ab8f3a void Update(const content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -201,7 +203,7 @@ class LocationBarView : public LocationBar, - bool ActivateFirstInactiveBubbleForAccessibility(); - - // LocationBar: -- void FocusLocation() override; -+ void FocusLocation(bool select_all) override; - void Revert() override; - OmniboxView* GetOmniboxView() override; - @@ -210,6 +212,7 @@ class LocationBarView : public LocationBar, void GetAccessibleNodeData(ui::AXNodeData* node_data) override; gfx::Size GetMinimumSize() const override; diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch deleted file mode 100644 index 129a927052d9..000000000000 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index fa70d696076a6bc031ce5980d291d0443c3fa2b0..c5d8d916ce0d3431cf367511ef88d5fb6ed35334 100644 ---- a/chrome/browser/ui/views/toolbar/toolbar_view.cc -+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -593,7 +593,7 @@ void ToolbarView::ChildPreferredSizeChanged(views::View* child) { - bool ToolbarView::SetPaneFocusAndFocusDefault() { - if (!location_bar_->HasFocus()) { - SetPaneFocus(location_bar_); -- location_bar_->FocusLocation(); -+ location_bar_->FocusLocation(true); - return true; - } - diff --git a/patches/chrome-test-base-test_browser_window.h.patch b/patches/chrome-test-base-test_browser_window.h.patch deleted file mode 100644 index 19094b5493a2..000000000000 --- a/patches/chrome-test-base-test_browser_window.h.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h -index 72d532db62eda2618ab5b581ee9ffbde68b9d05b..2745c291a6b0bbdfa099b763546089bb4fd85462 100644 ---- a/chrome/test/base/test_browser_window.h -+++ b/chrome/test/base/test_browser_window.h -@@ -88,7 +88,7 @@ class TestBrowserWindow : public BrowserWindow { - bool IsFullscreenBubbleVisible() const override; - LocationBar* GetLocationBar() const override; - PageActionIconContainer* GetPageActionIconContainer() override; -- void SetFocusToLocationBar() override {} -+ void SetFocusToLocationBar(bool select_all) override {} - void UpdateReloadStopState(bool is_loading, bool force) override {} - void UpdateToolbar(content::WebContents* contents) override {} - void UpdateToolbarVisibility(bool visible, bool animate) override {} -@@ -195,7 +195,7 @@ class TestBrowserWindow : public BrowserWindow { - base::TimeTicks GetMatchSelectionTimestamp() const override; - void AcceptInput() override {} - void AcceptInput(base::TimeTicks match_selection_timestamp) override {} -- void FocusLocation() override {} -+ void FocusLocation(bool select_all) override {} - void FocusSearch() override {} - void UpdateContentSettingsIcons() override {} - void UpdateSaveCreditCardIcon() override {} diff --git a/patches/components-crash-content-app-crashpad_mac.mm.patch b/patches/components-crash-content-app-crashpad_mac.mm.patch index 6b5f4669b7c5..c38a23deac21 100644 --- a/patches/components-crash-content-app-crashpad_mac.mm.patch +++ b/patches/components-crash-content-app-crashpad_mac.mm.patch @@ -2,7 +2,7 @@ diff --git a/components/crash/content/app/crashpad_mac.mm b/components/crash/con index a76d264648d23e7e228dd54f00a01035a29a76ad..ee7d94be5982353fced6174afef990713228af37 100644 --- a/components/crash/content/app/crashpad_mac.mm +++ b/components/crash/content/app/crashpad_mac.mm -@@ -136,6 +136,8 @@ void DumpProcessWithoutCrashing(task_t task_port) { +@@ -136,6 +136,8 @@ base::FilePath PlatformCrashpadInitialization( // Only allow the possibility of report upload in official builds. This // crash server won't have symbols for any other build types. std::string url = "https://clients2.google.com/cr/report"; diff --git a/patches/components-os_crypt-keychain_password_mac.mm.patch b/patches/components-os_crypt-keychain_password_mac.mm.patch index a6800b643e22..8aa4976f0773 100644 --- a/patches/components-os_crypt-keychain_password_mac.mm.patch +++ b/patches/components-os_crypt-keychain_password_mac.mm.patch @@ -10,7 +10,7 @@ index 73cd30591119969e5de1b2de56b984e54cdf6bac..4d14a957e73354cf79fabb0bb1be9bda #include "base/mac/mac_logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/rand_util.h" -@@ -51,8 +52,8 @@ +@@ -51,8 +52,8 @@ std::string AddRandomPasswordToKeychain(const AppleKeychain& keychain, const char KeychainPassword::service_name[] = "Chrome Safe Storage"; const char KeychainPassword::account_name[] = "Chrome"; #else @@ -21,7 +21,7 @@ index 73cd30591119969e5de1b2de56b984e54cdf6bac..4d14a957e73354cf79fabb0bb1be9bda #endif KeychainPassword::KeychainPassword( -@@ -63,31 +64,50 @@ +@@ -63,31 +64,50 @@ KeychainPassword::KeychainPassword( KeychainPassword::~KeychainPassword() = default; std::string KeychainPassword::GetPassword() const { diff --git a/patches/components-os_crypt-os_crypt_mac.mm.patch b/patches/components-os_crypt-os_crypt_mac.mm.patch index 8c046cedcf9b..4f8502fedef7 100644 --- a/patches/components-os_crypt-os_crypt_mac.mm.patch +++ b/patches/components-os_crypt-os_crypt_mac.mm.patch @@ -2,7 +2,7 @@ diff --git a/components/os_crypt/os_crypt_mac.mm b/components/os_crypt/os_crypt_ index 88304b2c3865ea3b126789f6a976d8bae4aa50ba..43dc62d9b829dbfbb605e7bfbf30cc0180daafc5 100644 --- a/components/os_crypt/os_crypt_mac.mm +++ b/components/os_crypt/os_crypt_mac.mm -@@ -100,6 +100,10 @@ +@@ -100,6 +100,10 @@ crypto::SymmetricKey* GetEncryptionKey() { DCHECK(!g_key_creation_util); g_key_creation_util = new os_crypt::EncryptionKeyCreationUtilIOS(); #endif diff --git a/patches/content-browser-frame_host-navigation_request.cc.patch b/patches/content-browser-frame_host-navigation_request.cc.patch index 70e3988b78e7..320d9ed819e8 100644 --- a/patches/content-browser-frame_host-navigation_request.cc.patch +++ b/patches/content-browser-frame_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index fef9c1c52e03646efc5f9cfb1e5acf2d662e2e22..3dcd99a6fcbb3e0885cf16d345eef96ff639db37 100644 +index ff845a4963826736b6030d7179a70dcd9d74d241..466cc388c20feafd1cc7ff53accef95e68a97911 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1589,6 +1589,11 @@ void NavigationRequest::OnStartChecksComplete( +@@ -1593,6 +1593,11 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(navigation_handle_->TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-storage_partition_impl.cc.patch b/patches/content-browser-storage_partition_impl.cc.patch index 7cb40eaa6764..076174f27c6a 100644 --- a/patches/content-browser-storage_partition_impl.cc.patch +++ b/patches/content-browser-storage_partition_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc -index 0ea9c15c210e2b1bc8777c303deb14461c4d7486..0120b60711e3b839e5c846ddfed543f887f5e334 100644 +index 66696708ac5efb20916aa64591949c2c20ee81c7..f214b9015c8449fccce4a45dcead370e3118a72e 100644 --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -961,6 +961,7 @@ void StoragePartitionImpl::OnCanSendReportingReports( +@@ -968,6 +968,7 @@ void StoragePartitionImpl::OnCanSendReportingReports( bool allowed = permission_controller->GetPermissionStatus( PermissionType::BACKGROUND_SYNC, origin_url, origin_url) == blink::mojom::PermissionStatus::GRANTED; @@ -10,7 +10,7 @@ index 0ea9c15c210e2b1bc8777c303deb14461c4d7486..0120b60711e3b839e5c846ddfed543f8 if (allowed) origins_out.push_back(origin); } -@@ -973,7 +974,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload( +@@ -980,7 +981,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload( OnCanSendDomainReliabilityUploadCallback callback) { PermissionController* permission_controller = BrowserContext::GetPermissionController(browser_context_); 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 54e08b09a33f..5d3d7302c93d 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 410b9fc2d86b802902de09f9608f4f7cb0f64af4..8bd6ae7896697a5780fbe3f8d2774588aa05d7b3 100644 +index b4d7064f055dcb14d290f1249502b222b6bcf798..f60266638404cffa0e1e698cb419e90656e4cc49 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1232,6 +1232,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1238,6 +1238,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, net::NetworkDelegate::AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/ui-native_theme-native_theme_mac.mm.patch b/patches/ui-native_theme-native_theme_mac.mm.patch index 72cc3e47fc8a..aa5ae1c66b96 100644 --- a/patches/ui-native_theme-native_theme_mac.mm.patch +++ b/patches/ui-native_theme-native_theme_mac.mm.patch @@ -2,7 +2,7 @@ diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_ index de3389fac98a708420374851dbf7c0970cb68102..32ca3fede8784b0f519174f314c302761dd0be75 100644 --- a/ui/native_theme/native_theme_mac.mm +++ b/ui/native_theme/native_theme_mac.mm -@@ -55,7 +55,11 @@ - (void)observeValueForKeyPath:(NSString*)forKeyPath +@@ -55,7 +55,11 @@ ofObject:(id)object change:(NSDictionary*)change context:(void*)context {