Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating patches from Chromium 74.0.3729.75 to Chromium 74.0.3729.91 #2265

Merged
merged 1 commit into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -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=63
+PATCH=45
2 changes: 1 addition & 1 deletion patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -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[] = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 @@
Expand All @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<KeyboardShortcutData>& 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},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<AlertDispatcher>
@@ -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(
Expand Down
13 changes: 0 additions & 13 deletions patches/chrome-browser-ui-browser.cc.patch

This file was deleted.

13 changes: 0 additions & 13 deletions patches/chrome-browser-ui-browser_commands.cc.patch

This file was deleted.

13 changes: 0 additions & 13 deletions patches/chrome-browser-ui-browser_window.h.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
13 changes: 2 additions & 11 deletions patches/chrome-browser-ui-location_bar-location_bar.h.patch
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
22 changes: 0 additions & 22 deletions patches/chrome-browser-ui-views-frame-browser_view.cc.patch

This file was deleted.

13 changes: 0 additions & 13 deletions patches/chrome-browser-ui-views-frame-browser_view.h.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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);
}

Expand All @@ -29,7 +11,7 @@ index 10bea76273f59c769553722bc2070850ed872d6b..eee3a12ac8dbc2f7c4cf868b27a86271
if (!IsInitialized())
return;

@@ -517,6 +520,11 @@ void LocationBarView::Layout() {
@@ -521,6 +521,11 @@ void LocationBarView::Layout() {
}
};

Expand All @@ -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);
}

////////////////////////////////////////////////////////////////////////////////
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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;
Expand Down
13 changes: 0 additions & 13 deletions patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch

This file was deleted.

22 changes: 0 additions & 22 deletions patches/chrome-test-base-test_browser_window.h.patch

This file was deleted.

2 changes: 1 addition & 1 deletion patches/components-crash-content-app-crashpad_mac.mm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions patches/components-os_crypt-keychain_password_mac.mm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion patches/components-os_crypt-os_crypt_mac.mm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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();

Expand Down
6 changes: 3 additions & 3 deletions patches/content-browser-storage_partition_impl.cc.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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;
+ allowed = false; // feature disabled in Brave
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_);
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion patches/ui-native_theme-native_theme_mac.mm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down