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

Unified Diff: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc

Issue 10317014: Move Command class out of the Extension class and into its own location (under chrome/common/exten… (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:
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 135314)
+++ chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc (working copy)
@@ -46,9 +46,9 @@
const Extension* extension) {
ExtensionCommandService* command_service =
ExtensionCommandServiceFactory::GetForProfile(profile_);
- const Extension::CommandMap& commands =
+ const extensions::CommandMap& commands =
command_service->GetActiveNamedCommands(extension->id());
- Extension::CommandMap::const_iterator iter = commands.begin();
+ extensions::CommandMap::const_iterator iter = commands.begin();
for (; iter != commands.end(); ++iter) {
ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(),
iter->second.accelerator().IsShiftDown(),
@@ -73,7 +73,7 @@
// Unlike on Windows, we need to explicitly add the browser action and page
// action to the event_targets_, even though we don't register them as
// handlers. See http://crbug.com/124873.
- const Extension::Command* browser_action =
+ const extensions::Command* browser_action =
command_service->GetActiveBrowserActionCommand(extension->id());
if (browser_action) {
ui::AcceleratorGtk accelerator(browser_action->accelerator().key_code(),
@@ -84,7 +84,7 @@
std::make_pair(extension->id(), browser_action->command_name());
}
- const Extension::Command* page_action =
+ const extensions::Command* page_action =
command_service->GetActivePageActionCommand(extension->id());
if (page_action) {
ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(),

Powered by Google App Engine
This is Rietveld 408576698