chrome/browser/extensions/extension_keybinding_registry.h - 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/extensions/extension_keybinding_registry.h

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: One more missing include 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

« no previous file with comments | « chrome/browser/extensions/extension_keybinding_apitest.cc ('k') | chrome/browser/ui/cocoa/accelerators_cocoa.h » ('j') | chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_keybinding_registry.h

diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h

index 7acd7f53784c59cf1396507da80cb6d0c5369212..3b1b1061e30bea49dd611acbd8e2e42c527c1fe4 100644

--- a/chrome/browser/extensions/extension_keybinding_registry.h

+++ b/chrome/browser/extensions/extension_keybinding_registry.h

@@ -15,6 +15,10 @@

class Profile;

+namespace ui {

+class Accelerator;

namespace extensions {

class ActiveTabPermissionGranter;

@@ -49,6 +53,11 @@ class ExtensionKeybindingRegistry : public content::NotificationObserver {

// platform-specific ExtensionKeybindingsRegistry* files.

static void SetShortcutHandlingSuspended(bool suspended);

+ // Returns true if the given |accelerator| is currently registered by

+ // Chrome. Implemented in platform-specific ExtensionKeybindingsRegistry*

+ // files.

+ static bool IsChromeAccelerator(const ui::Accelerator& accelerator);

// Overridden from content::NotificationObserver:

virtual void Observe(int type,

const content::NotificationSource& source,