Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5657)

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
Index: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc (revision 138124)
+++ chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc (working copy)
@@ -44,10 +44,12 @@
void ExtensionKeybindingRegistryGtk::AddExtensionKeybinding(
const extensions::Extension* extension) {
- ExtensionCommandService* command_service =
- ExtensionCommandServiceFactory::GetForProfile(profile_);
+ extensions::ExtensionCommandService* command_service =
+ extensions::ExtensionCommandServiceFactory::GetForProfile(profile_);
const extensions::CommandMap& commands =
- command_service->GetActiveNamedCommands(extension->id());
+ command_service->GetNamedCommands(
+ extension->id(),
+ extensions::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 +76,9 @@
// 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(),
+ extensions::ExtensionCommandService::ACTIVE_ONLY);
if (browser_action) {
ui::AcceleratorGtk accelerator(browser_action->accelerator().key_code(),
browser_action->accelerator().IsShiftDown(),
@@ -85,7 +89,9 @@
}
const extensions::Command* page_action =
- command_service->GetActivePageActionCommand(extension->id());
+ command_service->GetPageActionCommand(
+ extension->id(),
+ extensions::ExtensionCommandService::ACTIVE_ONLY);
if (page_action) {
ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(),
page_action->accelerator().IsShiftDown(),
« no previous file with comments | « 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 »

Powered by Google App Engine
This is Rietveld 408576698