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

chrome/common/extensions/extension.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/extensions/extension_action.h"
+#include "chrome/common/extensions/extension_commands.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_permission_set.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/gfx/size.h"
 
@@ skipping 117 matching lines @@
     std::string id;
     std::string description;
     std::string language;
     std::set<std::string> layouts;
     std::string shortcut_keycode;
     bool shortcut_alt;
     bool shortcut_ctrl;
     bool shortcut_shift;
   };
 
-  class Command {
-   public:
-    // Define out of line constructor/destructor to please Clang.
-    Command();
-    ~Command();
-
-    // The platform value for the Command.
-    static std::string CommandPlatform();
-
-    // Parse the command.
-    bool Parse(base::DictionaryValue* command,
-               const std::string& command_name,
-               int index,
-               string16* error);
-
-    // Accessors:
-    const std::string& command_name() const { return command_name_; }
-    const ui::Accelerator& accelerator() const { return accelerator_; }
-    const std::string& description() const { return description_; }
-
-   private:
-    ui::Accelerator ParseImpl(const std::string& shortcut,
-                              const std::string& platform_key,
-                              int index,
-                              string16* error);
-    std::string command_name_;
-    ui::Accelerator accelerator_;
-    std::string description_;
-  };
-
-  // A mapping of command name (std::string) to a command object.
-  typedef std::map<std::string, Command> CommandMap;
-
   struct TtsVoice {
     // Define out of line constructor/destructor to please Clang.
     TtsVoice();
     ~TtsVoice();
 
     std::string voice_name;
     std::string lang;
     std::string gender;
     std::set<std::string> event_types;
   };
@@ skipping 390 matching lines @@
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const std::vector<NaClModuleInfo>& nacl_modules() const {
     return nacl_modules_;
   }
   const std::vector<InputComponentInfo>& input_components() const {
     return input_components_;
   }
   // The browser action command that the extension wants to use, which is not
   // necessarily the one it can use, as it might be inactive (see also
   // GetActiveBrowserActionCommand in ExtensionKeybindingRegistry).
-  const Command* browser_action_command() const {
+  const extensions::Command* browser_action_command() const {
     return browser_action_command_.get();
   }
   // The page action command that the extension wants to use, which is not
   // necessarily the one it can use, as it might be inactive (see also
   // GetActivePageActionCommand in ExtensionKeybindingRegistry).
-  const Command* page_action_command() const {
+  const extensions::Command* page_action_command() const {
     return page_action_command_.get();
   }
   // The map (of command names to commands) that the extension wants to use,
   // which is not necessarily the one it can use, as they might be inactive
   // (see also GetActiveNamedCommands in ExtensionKeybindingRegistry).
-  const CommandMap& named_commands() const {
+  const extensions::CommandMap& named_commands() const {
     return named_commands_;
   }
   bool has_background_page() const {
     return background_url_.is_valid() || !background_scripts_.empty();
   }
   bool allow_background_js_access() const {
     return allow_background_js_access_;
   }
   const std::vector<std::string>& background_scripts() const {
     return background_scripts_;
@@ skipping 336 matching lines @@
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional list of NaCl modules and associated properties.
   std::vector<NaClModuleInfo> nacl_modules_;
 
   // Optional list of input components and associated properties.
   std::vector<InputComponentInfo> input_components_;
 
   // Optional list of commands (keyboard shortcuts).
-  scoped_ptr<Command> browser_action_command_;
-  scoped_ptr<Command> page_action_command_;
-  CommandMap named_commands_;
+  scoped_ptr<extensions::Command> browser_action_command_;
+  scoped_ptr<extensions::Command> page_action_command_;
+  extensions::CommandMap named_commands_;
 
   // Optional list of web accessible extension resources.
   base::hash_set<std::string> web_accessible_resources_;
 
   // Optional URL to a master page of which a single instance should be always
   // loaded in the background.
   GURL background_url_;
 
   // Optional list of scripts to use to generate a background page. If this is
   // present, background_url_ will be empty and generated by GetBackgroundURL().
@@ skipping 156 matching lines @@
   // only contain the removed permissions.
   const ExtensionPermissionSet* permissions;
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const ExtensionPermissionSet* permissions,
       Reason reason);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_