Avoid clobering user input on newtab #2222
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -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 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() { | |||
There was a problem hiding this comment.
It was in a different commit which is because the previous Chrome rebase did not rebase these files properly.
| @@ -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 @@ void NotificationPlatformBridgeMac::Display( | |||
| @@ -226,6 +226,7 @@ @interface AlertDispatcherImpl : NSObject<AlertDispatcher> | |||
| @@ -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 @@ const struct AcceleratorMapping { | |||
| @@ -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 @@ base::FilePath PlatformCrashpadInitialization( | |||
| @@ -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 @@ std::string AddRandomPasswordToKeychain(const AppleKeychain& keychain, | |||
| @@ -21,7 +21,7 @@ index 73cd30591119969e5de1b2de56b984e54cdf6bac..4d14a957e73354cf79fabb0bb1be9bda | |||
| #endif | |||
|
|
|||
| KeychainPassword::KeychainPassword( | |||
| @@ -63,31 +64,50 @@ KeychainPassword::KeychainPassword( | |||
| @@ -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 @@ crypto::SymmetricKey* GetEncryptionKey() { | |||
| @@ -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 @@ | |||
pilgrim-brave
previously approved these changes
Apr 16, 2019
Fix brave/brave-browser#3756 This implements a fix which is already in Chromium 75. Once we get on Chromium 75 we can drop all of these patches. The fix this ports is here: https://chromium.googlesource.com/chromium/src/+/43ef038d92433b1e8230882d3daac767481d29d9
bbondy
force-pushed
the
location-bar-focus
branch
from
e1ea1f1
to
32211ab
Compare
This was referenced Apr 17, 2019
bbondy
added a commit
that referenced
this pull request
Apr 17, 2019
Avoid clobering user input on newtab
bbondy
added a commit
that referenced
this pull request
Apr 17, 2019
Avoid clobering user input on newtab
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This just pulls in a fix that was done upstream in C75 into C74.
The upstream fix will happen in 75.0.3760.0, at which point we can drop these patches.
Fix brave/brave-browser#3756
Submitter Checklist:
npm test brave_unit_tests && npm test brave_browser_tests && npm run test-security) onnpm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist: