Move Commands from Extension to CommandsHandler

chrome/common/extensions/command.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/common/extensions/command.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 184 matching lines @@
 
 // static
 ui::Accelerator Command::StringToAccelerator(const std::string& accelerator) {
   string16 error;
   Command command;
   ui::Accelerator parsed =
       ParseImpl(accelerator, Command::CommandPlatform(), 0, &error);
   return parsed;
 }
 
-bool Command::Parse(DictionaryValue* command,
+bool Command::Parse(const base::DictionaryValue* command,
                     const std::string& command_name,
                     int index,
                     string16* error) {
   DCHECK(!command_name.empty());
 
   // We'll build up a map of platform-to-shortcut suggestions.
   typedef std::map<const std::string, std::string> SuggestionMap;
   SuggestionMap suggestions;
 
   // First try to parse the |suggested_key| as a dictionary.
-  DictionaryValue* suggested_key_dict;
+  const base::DictionaryValue* suggested_key_dict;
   if (command->GetDictionary(keys::kSuggestedKey, &suggested_key_dict)) {
-    DictionaryValue::key_iterator iter = suggested_key_dict->begin_keys();
+    base::DictionaryValue::key_iterator iter = suggested_key_dict->begin_keys();
     for ( ; iter != suggested_key_dict->end_keys(); ++iter) {
       // For each item in the dictionary, extract the platforms specified.
       std::string suggested_key_string;
       if (suggested_key_dict->GetString(*iter, &suggested_key_string) &&
           !suggested_key_string.empty()) {
         // Found a platform, add it to the suggestions list.
         suggestions[*iter] = suggested_key_string;
       } else {
         *error = ErrorUtils::FormatErrorMessageUTF16(
             errors::kInvalidKeyBinding,
@@ skipping 91 matching lines @@
               errors::kInvalidKeyBindingDescription,
               base::IntToString(index));
           return false;
         }
       }
     }
   }
   return true;
 }
 
-DictionaryValue* Command::ToValue(const Extension* extension,
-                                  bool active) const {
-  DictionaryValue* extension_data = new DictionaryValue();
+base::DictionaryValue* Command::ToValue(const Extension* extension,
+                                        bool active) const {
+  base::DictionaryValue* extension_data = new base::DictionaryValue();
 
   string16 command_description;
   if (command_name() == values::kBrowserActionCommandEvent ||
       command_name() == values::kPageActionCommandEvent ||
       command_name() == values::kScriptBadgeCommandEvent) {
     command_description =
         l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GENERIC_ACTIVATE);
   } else {
     command_description = description();
   }
   extension_data->SetString("description", command_description);
   extension_data->SetBoolean("active", active);
   extension_data->SetString("keybinding", accelerator().GetShortcutText());
   extension_data->SetString("command_name", command_name());
   extension_data->SetString("extension_id", extension->id());
 
   return extension_data;
 }
 
 }  // namespace extensions