chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc - Issue 10201016: Conflict detection for Extension Keybinding.

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/gtk/extensions/extension_keybinding_registry_gtk.cc

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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:

Index: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc

===================================================================

--- chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc (revision 133458)

+++ chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc (working copy)

@@ -42,9 +42,10 @@

void ExtensionKeybindingRegistryGtk::AddExtensionKeybinding(

const Extension* extension) {

- // Add all the keybindings (except pageAction and browserAction, which are

- // handled elsewhere).

- const Extension::CommandMap& commands = extension->named_commands();

+ // Add all the active keybindings (except page actions and browser actions,

+ // which are handled elsewhere).

+ const Extension::CommandMap& commands =

+ GetActiveNamedCommands(profile_, extension->id());

Extension::CommandMap::const_iterator iter = commands.begin();

for (; iter != commands.end(); ++iter) {

ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(),