Rename ExtensionCommand* to Command* within the extension namespace.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h"
 
-#include "chrome/browser/extensions/api/commands/extension_command_service.h"
-#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
+#include "chrome/browser/extensions/api/commands/command_service.h"
+#include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 
 ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk(
     Profile* profile, gfx::NativeWindow window)
     : ExtensionKeybindingRegistry(profile),
       profile_(profile),
@@ skipping 18 matching lines @@
     const GdkEventKey* event) const {
   ui::AcceleratorGtk accelerator(ui::WindowsKeyCodeForGdkKeyCode(event->keyval),
                                  event->state & GDK_SHIFT_MASK,
                                  event->state & GDK_CONTROL_MASK,
                                  event->state & GDK_MOD1_MASK);
   return event_targets_.find(accelerator) != event_targets_.end();
 }
 
 void ExtensionKeybindingRegistryGtk::AddExtensionKeybinding(
     const extensions::Extension* extension) {
-  extensions::ExtensionCommandService* command_service =
-      extensions::ExtensionCommandServiceFactory::GetForProfile(profile_);
+  extensions::CommandService* command_service =
+      extensions::CommandServiceFactory::GetForProfile(profile_);
   const extensions::CommandMap& commands =
       command_service->GetNamedCommands(
           extension->id(),
-          extensions::ExtensionCommandService::ACTIVE_ONLY);
+          extensions::CommandService::ACTIVE_ONLY);
   extensions::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
     ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(),
                                    iter->second.accelerator().IsShiftDown(),
                                    iter->second.accelerator().IsCtrlDown(),
                                    iter->second.accelerator().IsAltDown());
     event_targets_[accelerator] =
         std::make_pair(extension->id(), iter->second.command_name());
 
     if (!accel_group_) {
       accel_group_ = gtk_accel_group_new();
       gtk_window_add_accel_group(window_, accel_group_);
     }
 
     gtk_accel_group_connect(
         accel_group_,
         accelerator.GetGdkKeyCode(),
         accelerator.gdk_modifier_type(),
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk), this, NULL));
   }
 
   // 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 extensions::Command* browser_action =
       command_service->GetBrowserActionCommand(
           extension->id(),
-          extensions::ExtensionCommandService::ACTIVE_ONLY);
+          extensions::CommandService::ACTIVE_ONLY);
   if (browser_action) {
     ui::AcceleratorGtk accelerator(browser_action->accelerator().key_code(),
                                    browser_action->accelerator().IsShiftDown(),
                                    browser_action->accelerator().IsCtrlDown(),
                                    browser_action->accelerator().IsAltDown());
     event_targets_[accelerator] =
       std::make_pair(extension->id(), browser_action->command_name());
   }
 
   const extensions::Command* page_action =
       command_service->GetPageActionCommand(
           extension->id(),
-          extensions::ExtensionCommandService::ACTIVE_ONLY);
+          extensions::CommandService::ACTIVE_ONLY);
   if (page_action) {
     ui::AcceleratorGtk accelerator(page_action->accelerator().key_code(),
                                    page_action->accelerator().IsShiftDown(),
                                    page_action->accelerator().IsCtrlDown(),
                                    page_action->accelerator().IsAltDown());
     event_targets_[accelerator] =
         std::make_pair(extension->id(), page_action->command_name());
   }
 }
 
@@ skipping 34 matching lines @@
   if (it == event_targets_.end()) {
     NOTREACHED();  // Shouldn't get this event for something not registered.
     return FALSE;
   }
 
   service->browser_event_router()->CommandExecuted(
       profile_, it->second.first, it->second.second);
 
   return TRUE;
 }