chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc - Issue 10383240: This adds a webui overlay on the extensions page for showing what Extension keybindings are active.…

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 10383240: This adds a webui overlay on the extensions page for showing what Extension keybindings are active.… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 7 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/resources/shared/js/load_time_data.js ('K') | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -47,7 +47,8 @@

ExtensionCommandService* command_service =

ExtensionCommandServiceFactory::GetForProfile(profile_);

const extensions::CommandMap& commands =

- command_service->GetActiveNamedCommands(extension->id());

+ command_service->GetNamedCommands(extension->id(),

+ ExtensionCommandService::ACTIVE_ONLY);

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

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

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

@@ -74,7 +75,8 @@

// action to the event_targets_, even though we don't register them as

// handlers. See http://crbug.com/124873.

const extensions::Command* browser_action =

- command_service->GetActiveBrowserActionCommand(extension->id());

+ command_service->GetBrowserActionCommand(

+ extension->id(), ExtensionCommandService::ACTIVE_ONLY);

if (browser_action) {

ui::AcceleratorGtk accelerator(browser_action->accelerator().key_code(),

browser_action->accelerator().IsShiftDown(),

@@ -85,7 +87,8 @@

}

const extensions::Command* page_action =

- command_service->GetActivePageActionCommand(extension->id());

+ command_service->GetPageActionCommand(

+ extension->id(), ExtensionCommandService::ACTIVE_ONLY);

if (page_action) {

ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(),

page_action->accelerator().IsShiftDown(),