diff options
| author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-16 05:48:25 +0000 |
|---|---|---|
| committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-16 05:48:25 +0000 |
| commit | fa4778faf09e179bde7f6806f79e3a98140b4354 (patch) | |
| tree | 503a675b0577e43dcb12fd67def3dd95ca481f0e /chrome/browser/ui/cocoa/browser_window_cocoa.mm | |
| parent | 6e963dbd55d251c862f7c636be7358cffe7affd1 (diff) | |
| download | chromium_src-fa4778faf09e179bde7f6806f79e3a98140b4354.zip chromium_src-fa4778faf09e179bde7f6806f79e3a98140b4354.tar.gz chromium_src-fa4778faf09e179bde7f6806f79e3a98140b4354.tar.bz2 | |
mac: Allow WebContents key handling to supplant extension overrides of the bookmark shortcut.
Use the same prioritization for accelerator processing for the bookmark
shortcut when overridden by an extension as for when it is built-in to
the browser. Namely, allow WebContents key processing to take place
before extension accelerator processing.
This is the Mac version of the fix. Views was fixed at:
https://codereview.chromium.org/360423002.
BUG=389340
Review URL: https://codereview.chromium.org/388313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_cocoa.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index f51bf9f..43836af 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -579,7 +579,9 @@ bool BrowserWindowCocoa::PreHandleKeyboardEvent( return false; if (event.type == blink::WebInputEvent::RawKeyDown && - [controller_ handledByExtensionCommand:event.os_event]) + [controller_ + handledByExtensionCommand:event.os_event + priority:ui::AcceleratorManager::kHighPriority]) return true; int id = [BrowserWindowUtils getCommandId:event]; |