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

Unified Diff: chrome/browser/ui/views/browser_actions_container.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/views/browser_actions_container.cc
===================================================================
--- chrome/browser/ui/views/browser_actions_container.cc (revision 138124)
+++ chrome/browser/ui/views/browser_actions_container.cc (working copy)
@@ -133,11 +133,13 @@
UpdateState();
}
- ExtensionCommandService* command_service =
- ExtensionCommandServiceFactory::GetForProfile(
+ extensions::ExtensionCommandService* command_service =
+ extensions::ExtensionCommandServiceFactory::GetForProfile(
panel_->browser()->profile());
const extensions::Command* browser_action_command =
- command_service->GetActiveBrowserActionCommand(extension_->id());
+ command_service->GetBrowserActionCommand(
+ extension_->id(),
+ extensions::ExtensionCommandService::ACTIVE_ONLY);
if (browser_action_command) {
keybinding_.reset(new ui::Accelerator(
browser_action_command->accelerator()));
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/views/extensions/extension_installed_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698