Rename ExtensionCommand* to Command* within the extension namespace.

chrome/browser/ui/views/extensions/extension_keybinding_registry_views.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/views/extensions/extension_keybinding_registry_views.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/views/focus/focus_manager.h"
 
 ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews(
     Profile* profile, views::FocusManager* focus_manager)
     : ExtensionKeybindingRegistry(profile),
       profile_(profile),
       focus_manager_(focus_manager) {
   Init();
 }
 
 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() {
   EventTargets::const_iterator iter;
   for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter)
     focus_manager_->UnregisterAccelerator(iter->first, this);
 }
 
 void ExtensionKeybindingRegistryViews::AddExtensionKeybinding(
     const extensions::Extension* extension) {
-  extensions::ExtensionCommandService* command_service =
-      extensions::ExtensionCommandServiceFactory::GetForProfile(profile_);
+  extensions::CommandService* command_service =
+      extensions::CommandServiceFactory::GetForProfile(profile_);
   // Add all the active keybindings (except page actions and browser actions,
   // which are handled elsewhere).
   const extensions::CommandMap& commands =
       command_service->GetNamedCommands(
-          extension->id(),
-          extensions::ExtensionCommandService::ACTIVE_ONLY);
+          extension->id(), extensions::CommandService::ACTIVE_ONLY);
   extensions::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
     event_targets_[iter->second.accelerator()] =
         std::make_pair(extension->id(), iter->second.command_name());
     focus_manager_->RegisterAccelerator(
         iter->second.accelerator(),
         ui::AcceleratorManager::kHighPriority, this);
   }
 }
 
@@ skipping 25 matching lines @@
 
   service->browser_event_router()->CommandExecuted(
       profile_, it->second.first, it->second.second);
 
   return true;
 }
 
 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const {
   return true;
 }