Move Command class out of the Extension class and into its own location (under chrome/common/exten…

chrome/browser/extensions/api/commands/extension_command_service.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/extensions/api/commands/extension_command_service.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 
 namespace {
 
 const char kExtension[] = "extension";
 const char kCommandName[] = "command_name";
 
 std::string GetPlatformKeybindingKeyForAccelerator(
     const ui::Accelerator& accelerator) {
-  return Extension::Command::CommandPlatform() + ":" +
+  return extensions::Command::CommandPlatform() + ":" +
          UTF16ToUTF8(accelerator.GetShortcutText());
 }
 
 }  // namespace
 
 // static
 void ExtensionCommandService::RegisterUserPrefs(
   PrefService* user_prefs) {
       user_prefs->RegisterDictionaryPref(prefs::kExtensionKeybindings,
                                          PrefService::SYNCABLE_PREF);
 }
 
 ExtensionCommandService::ExtensionCommandService(
     Profile* profile)
     : profile_(profile) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile));
 }
 
 ExtensionCommandService::~ExtensionCommandService() {
 }
 
-const Extension::Command*
+const extensions::Command*
     ExtensionCommandService::GetActiveBrowserActionCommand(
         const std::string& extension_id) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
-  const Extension::Command* command = extension->browser_action_command();
+  const extensions::Command* command = extension->browser_action_command();
   if (!command)
     return NULL;
   if (!IsKeybindingActive(command->accelerator(),
                           extension_id,
                           command->command_name())) {
     return NULL;
   }
 
   return command;
 }
 
-const Extension::Command* ExtensionCommandService::GetActivePageActionCommand(
+const extensions::Command* ExtensionCommandService::GetActivePageActionCommand(
     const std::string& extension_id) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
-  const Extension::Command* command = extension->page_action_command();
+  const extensions::Command* command = extension->page_action_command();
   if (!command)
     return NULL;
   if (!IsKeybindingActive(command->accelerator(),
                           extension_id,
                           command->command_name())) {
     return NULL;
   }
 
   return command;
 }
 
-Extension::CommandMap ExtensionCommandService::GetActiveNamedCommands(
+extensions::CommandMap ExtensionCommandService::GetActiveNamedCommands(
     const std::string& extension_id) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
-  Extension::CommandMap result;
-  const Extension::CommandMap& commands = extension->named_commands();
+  extensions::CommandMap result;
+  const extensions::CommandMap& commands = extension->named_commands();
   if (commands.empty())
     return result;
 
-  Extension::CommandMap::const_iterator iter = commands.begin();
+  extensions::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
     if (!IsKeybindingActive(iter->second.accelerator(),
                             extension_id,
                             iter->second.command_name())) {
       continue;
     }
 
     result[iter->second.command_name()] = iter->second;
   }
 
@@ skipping 62 matching lines @@
       RemoveKeybindingPrefs(*content::Details<std::string>(details).ptr());
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void ExtensionCommandService::AssignInitialKeybindings(
     const Extension* extension) {
-  const Extension::CommandMap& commands = extension->named_commands();
-  Extension::CommandMap::const_iterator iter = commands.begin();
+  const extensions::CommandMap& commands = extension->named_commands();
+  extensions::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
     AddKeybindingPref(iter->second.accelerator(),
                       extension->id(),
                       iter->second.command_name(),
                       false);  // Overwriting not allowed.
   }
 
-  const Extension::Command* browser_action_command =
+  const extensions::Command* browser_action_command =
       extension->browser_action_command();
   if (browser_action_command) {
     AddKeybindingPref(browser_action_command->accelerator(),
                       extension->id(),
                       browser_action_command->command_name(),
                       false);  // Overwriting not allowed.
   }
 
-  const Extension::Command* page_action_command =
+  const extensions::Command* page_action_command =
       extension->page_action_command();
   if (page_action_command) {
     AddKeybindingPref(page_action_command->accelerator(),
                       extension->id(),
                       page_action_command->command_name(),
                       false);  // Overwriting not allowed.
   }
 }
 
 void ExtensionCommandService::RemoveKeybindingPrefs(std::string extension_id) {
@@ skipping 13 matching lines @@
     item->GetString(kExtension, &extension);
     if (extension == extension_id)
       keys_to_remove.push_back(key);
   }
 
   for (KeysToRemove::const_iterator it = keys_to_remove.begin();
        it != keys_to_remove.end(); ++it) {
     bindings->Remove(*it, NULL);
   }
 }