Move Commands from Extension to CommandsHandler

chrome/browser/extensions/api/commands/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/command_service.h"
 
 #include "base/string_util.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/extensions/api/commands/commands_handler.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 
 using extensions::Extension;
 
 namespace {
 
 const char kExtension[] = "extension";
@@ skipping 11 matching lines @@
 
 // static
 void CommandService::RegisterUserPrefs(
   PrefService* user_prefs) {
       user_prefs->RegisterDictionaryPref(prefs::kExtensionCommands,
                                          PrefService::SYNCABLE_PREF);
 }
 
 CommandService::CommandService(Profile* profile)
     : profile_(profile) {
+  ManifestHandler::Register(extension_manifest_keys::kCommands,

[Devlin, 2012/12/21 20:36:21]

I don't think we want to create an additional CommandsAPI, when CommandService
does a lot of the same setup (but I could be wrong).  That being said, do we
want to rename CommandService to CommandsAPI for consistency?

[Yoyo Zhou, 2012/12/22 00:38:33]

No, it doesn't need to be renamed.

+                            new CommandsHandler);
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile));
 }
 
 CommandService::~CommandService() {
 }
 
 bool CommandService::GetBrowserActionCommand(
@@ skipping 25 matching lines @@
 
 bool CommandService::GetNamedCommands(const std::string& extension_id,
                                       QueryType type,
                                       extensions::CommandMap* command_map) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
   command_map->clear();
-  const extensions::CommandMap& commands = extension->named_commands();
-  if (commands.empty())
+  const extensions::CommandMap* commands =
+      CommandsInfo::GetNamedCommands(extension);
+  if (!commands)
     return false;
 
-  extensions::CommandMap::const_iterator iter = commands.begin();
-  for (; iter != commands.end(); ++iter) {
+  extensions::CommandMap::const_iterator iter = commands->begin();
+  for (; iter != commands->end(); ++iter) {
     ui::Accelerator shortcut_assigned =
         FindShortcutForCommand(extension_id, iter->second.command_name());
 
     if (type == ACTIVE_ONLY && shortcut_assigned.key_code() == ui::VKEY_UNKNOWN)
       continue;
 
     extensions::Command command = iter->second;
     if (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN)
       command.set_accelerator(shortcut_assigned);
 
@@ skipping 90 matching lines @@
     if (StartsWithASCII(shortcut, Command::CommandPlatform() + ":", true))
       shortcut = shortcut.substr(Command::CommandPlatform().length() + 1);
 
     return Command::StringToAccelerator(shortcut);
   }
 
   return ui::Accelerator();
 }
 
 void CommandService::AssignInitialKeybindings(const Extension* extension) {
-  const extensions::CommandMap& commands = extension->named_commands();
-  extensions::CommandMap::const_iterator iter = commands.begin();
-  for (; iter != commands.end(); ++iter) {
+  const extensions::CommandMap* commands =
+      CommandsInfo::GetNamedCommands(extension);
+  if (!commands)
+    return;
+
+  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 extensions::Command* browser_action_command =
-      extension->browser_action_command();
+      CommandsInfo::GetBrowserActionCommand(extension);
   if (browser_action_command) {
     AddKeybindingPref(browser_action_command->accelerator(),
                       extension->id(),
                       browser_action_command->command_name(),
                       false);  // Overwriting not allowed.
   }
 
   const extensions::Command* page_action_command =
-      extension->page_action_command();
+      CommandsInfo::GetPageActionCommand(extension);
   if (page_action_command) {
     AddKeybindingPref(page_action_command->accelerator(),
                       extension->id(),
                       page_action_command->command_name(),
                       false);  // Overwriting not allowed.
   }
 
   const extensions::Command* script_badge_command =
-      extension->script_badge_command();
+      CommandsInfo::GetScriptBadgeCommand(extension);
   if (script_badge_command) {
     AddKeybindingPref(script_badge_command->accelerator(),
                       extension->id(),
                       script_badge_command->command_name(),
                       false);  // Overwriting not allowed.
   }
 }
 
 void CommandService::RemoveKeybindingPrefs(const std::string& extension_id,
                                            const std::string& command_name) {
@@ skipping 54 matching lines @@
   const ExtensionSet* extensions = service->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
   if (active)
     *active = false;
 
   const extensions::Command* requested_command = NULL;
   switch (action_type) {
     case BROWSER_ACTION:
-      requested_command = extension->browser_action_command();
+      requested_command = CommandsInfo::GetBrowserActionCommand(extension);
       break;
     case PAGE_ACTION:
-      requested_command = extension->page_action_command();
+      requested_command = CommandsInfo::GetPageActionCommand(extension);
       break;
     case SCRIPT_BADGE:
-      requested_command = extension->script_badge_command();
+      requested_command = CommandsInfo::GetScriptBadgeCommand(extension);
       break;
   }
   if (!requested_command)
     return false;
 
   ui::Accelerator shortcut_assigned =
       FindShortcutForCommand(extension_id, requested_command->command_name());
 
   if (active)
     *active = (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN);
 
   if (query_type == ACTIVE_ONLY &&
       shortcut_assigned.key_code() == ui::VKEY_UNKNOWN)
     return false;
 
   *command = *requested_command;
   if (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN)
     command->set_accelerator(shortcut_assigned);
 
   return true;
 }
 
 }  // namespace extensions