chrome/browser/ui/cocoa/browser_window_controller.mm - Issue 388313002: mac: Allow WebContents key handling to supplant extension overrides of the bookmark shortcut.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 388313002: mac: Allow WebContents key handling to supplant extension overrides of the bookmark shortcut. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comment from wittman. Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/browser_window_controller.h ('K') | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/chrome_event_processing_window.mm » ('j') | chrome/test/data/extensions/test_file_with_ctrl-d_keybinding.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm

index 5f0a158e0a8e55db4e42b29bb8cebb72fa6014f0..61fbc05d88709f4491221d759995115ce0a5d994 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -1226,9 +1226,11 @@ using web_modal::WebContentsModalDialogManager;

chrome::ExecuteCommand(browser_.get(), command);

}

-- (BOOL)handledByExtensionCommand:(NSEvent*)event {

+- (BOOL)handledByExtensionCommand:(NSEvent*)event

+ priority:

+ (ui::AcceleratorManager::HandlerPriority)priority {

Scott Hess - ex-Googler 2014/07/15 19:20:59 Sigh.

erikchen 2014/07/15 20:48:40 Done.

return extension_keybinding_registry_->ProcessKeyEvent(

- content::NativeWebKeyboardEvent(event));

+ content::NativeWebKeyboardEvent(event), priority);

}

// StatusBubble delegate method: tell the status bubble the frame it should