Move ExtensionAction from common/ to browser/.

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_
 
 #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 "chrome/common/extensions/command.h"
-#include "chrome/common/extensions/extension_action.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 "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"
@@ skipping 166 matching lines @@
   struct OAuth2Info {
     OAuth2Info();
     ~OAuth2Info();
 
     OAuth2Scopes GetScopesAsSet();
 
     std::string client_id;
     std::vector<std::string> scopes;
   };
 
+  // Manifest information for ExtensionActions.
+  struct ActionInfo {
+    // The types of extension actions.
+    enum Type {
+      TYPE_BROWSER,

[Aaron Boodman, 2012/09/16 01:42:50]

Do we need to carry around the type? The caller knows what type it is because of
the member it comes from. Perhaps this information only needed in browser?

[not at google - send to devlin, 2012/09/27 00:46:10]

It was initially added for when page actions got implicitly converted into
browser actions, for the script badges. Even though extension->browser_action()
returned an ExtensionAction, it was actually a page action and the API calls
needed to be made as such.

Since then it's also being used to decide what sizes to make the icons, I think.

While explaining that it makes me think that this is the wrong model to use, and
what we actually want is for the browser version of ExtensionAction to have a
"location" property, like

enum Location {
  LOCATION_BAR,
  TOOLBAR,
  ACTION_BOX
};

and then for the "type" to be removed and code which relies on it to use the
Location property instead.

+      TYPE_PAGE,
+      TYPE_SCRIPT_BADGE,
+    };
+
+    explicit ActionInfo(Type action_type);
+    ~ActionInfo();
+
+    Type action_type;
+
+    // Empty implies not present.
+    std::string default_icon_path;
+    std::string default_title;
+    GURL default_popup_url;
+    // action id -- only used with legacy page actions API.
+    std::string id;
+  };
+
   struct InstallWarning {
     enum Format {
       // IMPORTANT: Do not build HTML strings from user or developer-supplied
       // input.
       FORMAT_TEXT,
       FORMAT_HTML,
     };
     InstallWarning(Format format, const std::string& message)
         : format(format), message(message) {
     }
@@ skipping 394 matching lines @@
   // Base64-encoded version of the key used to sign this extension.
   // In pseudocode, returns
   // base::Base64Encode(RSAPrivateKey(pem_file).ExportPublicKey()).
   const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   int manifest_version() const { return manifest_version_; }
   bool converted_from_user_script() const {
     return converted_from_user_script_;
   }
   const UserScriptList& content_scripts() const { return content_scripts_; }
-  ExtensionAction* script_badge() const { return script_badge_.get(); }
-  ExtensionAction* page_action() const { return page_action_.get(); }
-  ExtensionAction* browser_action() const { return browser_action_.get(); }
+  ActionInfo* script_badge() const { return script_badge_.get(); }
+  ActionInfo* page_action() const { return page_action_.get(); }
+  ActionInfo* browser_action() const { return browser_action_.get(); }
   bool is_verbose_install_message() const {
     return !omnibox_keyword().empty() ||
            browser_action() ||
            (page_action() &&
                (page_action_command() ||
-                !page_action()->default_icon_path().empty()));
+                !page_action()->default_icon_path.empty()));
   }
   const FileBrowserHandlerList* file_browser_handlers() const {
     return file_browser_handlers_.get();
   }
   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_;
@@ skipping 268 matching lines @@
 
   // Helper method that loads either the include_globs or exclude_globs list
   // from an entry in the content_script lists of the manifest.
   bool LoadGlobsHelper(const base::DictionaryValue* content_script,
                        int content_script_index,
                        const char* globs_property_name,
                        string16* error,
                        void(UserScript::*add_method)(const std::string& glob),
                        UserScript* instance);
 
-  // Helper method to load an ExtensionAction from the page_action or
-  // browser_action entries in the manifest.
-  scoped_ptr<ExtensionAction> LoadExtensionActionHelper(
+  // Helper method to load an ActionInfo from the page_action,
+  // browser_action, or script_badge entries in the manifest.
+  scoped_ptr<ActionInfo> LoadExtensionActionHelper(
       const base::DictionaryValue* extension_action,
-      ExtensionAction::Type action_type,
+      ActionInfo::Type action_type,
       string16* error);
 
   // Helper method that loads the OAuth2 info from the 'oauth2' manifest key.
   bool LoadOAuth2Info(string16* error);
 
   // Returns true if the extension has more than one "UI surface". For example,
   // an extension that has a browser action and a page action.
   bool HasMultipleUISurfaces() const;
 
   // Updates the launch URL and extents for the extension using the given
@@ skipping 84 matching lines @@
   std::string description_;
 
   // True if the extension was generated from a user script. (We show slightly
   // different UI if so).
   bool converted_from_user_script_;
 
   // Paths to the content scripts the extension contains.
   UserScriptList content_scripts_;
 
   // The extension's page action, if any.
-  scoped_ptr<ExtensionAction> page_action_;
+  scoped_ptr<ActionInfo> page_action_;
 
   // The extension's browser action, if any.
-  scoped_ptr<ExtensionAction> browser_action_;
+  scoped_ptr<ActionInfo> browser_action_;
 
   // The extension's script badge.  Never NULL.
-  scoped_ptr<ExtensionAction> script_badge_;
+  scoped_ptr<ActionInfo> script_badge_;
 
   // The extension's file browser actions, if any.
   scoped_ptr<FileBrowserHandlerList> file_browser_handlers_;
 
   // 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_;
 
@@ skipping 183 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_