Move Commands from Extension to CommandsHandler

chrome/common/extensions/extension.h

 // Copyright (c) 2013 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_
 
 #include <algorithm>
 #include <iosfwd>
 #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 "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"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
 #include "chrome/common/extensions/permissions/permission_message.h"
 #include "chrome/common/extensions/user_script.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/accelerators/accelerator.h"
@@ skipping 574 matching lines @@
   const ActionInfo* browser_action_info() const {
     return browser_action_info_.get();
   }
   const ActionInfo* system_indicator_info() const {
     return system_indicator_info_.get();
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   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();
   }
   bool allow_background_js_access() const {
     return allow_background_js_access_;
   }
   const std::vector<std::string>& background_scripts() const {
     return background_scripts_;
   }
   bool has_persistent_background_page() const {
@@ skipping 147 matching lines @@
                   const char* value_error,
                   string16* error);
   bool LoadLaunchContainer(string16* error);
   bool LoadLaunchURL(string16* error);
 
   bool LoadSharedFeatures(const APIPermissionSet& api_permissions,
                           string16* error);
   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);
   // Must be called after LoadPlugins().
   bool LoadRequirements(string16* error);
   bool LoadDefaultLocale(string16* error);
   bool LoadOfflineEnabled(string16* error);
   bool LoadBackgroundScripts(string16* error);
   bool LoadBackgroundScripts(const std::string& key, string16* error);
   bool LoadBackgroundPage(const APIPermissionSet& api_permissions,
@@ skipping 167 matching lines @@
 
   // The extension's system indicator, if any.
   scoped_ptr<ActionInfo> system_indicator_info_;
 
   // 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 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_;
 
   // Content Security Policy that should be used to enforce the sandbox used
   // by sandboxed pages (guaranteed to have the "sandbox" directive without the
   // "allow-same-origin" token).
   std::string sandboxed_pages_content_security_policy_;
 
   // Optional URL to a master page of which a single instance should be always
@@ skipping 153 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_