Move Commands from Extension to CommandsHandler

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index ae2c9c0392ed758424145c562f06496b2180b676..54759a3dffd6c31778ae56cffe296fd3392dcf29 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -22,7 +22,6 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
-#include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
@@ -617,30 +616,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   const std::vector<NaClModuleInfo>& nacl_modules() const {
     return nacl_modules_;
   }
-  // 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
-  // GetBrowserActionCommand in CommandService).
-  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
-  // GetPageActionCommand in CommandService).
-  const extensions::Command* page_action_command() const {
-    return page_action_command_.get();
-  }
-  // The script badge command that the extension wants to use, which is not
-  // necessarily the one it can use, as it might be inactive (see also
-  // GetScriptBadgeCommand in CommandService).
-  const extensions::Command* script_badge_command() const {
-    return script_badge_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 GetNamedCommands in CommandService).
-  const extensions::CommandMap& named_commands() const {
-    return named_commands_;
-  }
   bool has_background_page() const {
     return background_url_.is_valid() || !background_scripts_.empty();
   }
@@ -808,7 +783,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   bool LoadDescription(string16* error);
   bool LoadManifestVersion(string16* error);
   bool LoadIcons(string16* error);
-  bool LoadCommands(string16* error);
   bool LoadPlugins(string16* error);
   bool LoadNaClModules(string16* error);
   bool LoadSandboxedPages(string16* error);
@@ -996,12 +970,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   // Optional list of NaCl modules and associated properties.
   std::vector<NaClModuleInfo> nacl_modules_;
 
-  // Optional list of commands (keyboard shortcuts).
-  scoped_ptr<extensions::Command> browser_action_command_;
-  scoped_ptr<extensions::Command> page_action_command_;
-  scoped_ptr<extensions::Command> script_badge_command_;
-  extensions::CommandMap named_commands_;
-
   // Optional list of extension pages that are sandboxed (served from a unique
   // origin with a different Content Security Policy).
   URLPatternSet sandboxed_pages_;