chrome/browser/ui/views/frame/browser_view.cc - Issue 13044014: Make sure manifest specified shortcut for Extension Command can not override the built-in shortcuts.

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/views/frame/browser_view.cc

Issue 13044014: Make sure manifest specified shortcut for Extension Command can not override the built-in shortcuts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cocoa CL Created 7 years, 8 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/views/extensions/extension_keybinding_registry_views.cc ('K') | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/test/data/extensions/api_test/keybinding/dont_overwrite_system/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index 1ad367d85043aa4f499ab4979925be8f57e149c4..29e18d82f67f893ad4a06e19b67321eeef149269 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -638,6 +638,10 @@ bool BrowserView::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {

cmd_id, browser_->host_desktop_type(), accelerator);

}

+bool BrowserView::IsAcceleratorRegistered(const ui::Accelerator& accelerator) {

+ return accelerator_table_.find(accelerator) != accelerator_table_.end();

WebContents* BrowserView::GetActiveWebContents() const {

return browser_->tab_strip_model()->GetActiveWebContents();

}