Refactor implementation of BrowserActions, and add support for

chrome/common/extensions/extension.h

 // Copyright (c) 2009 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 <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/common/extensions/extension_action.h"
+#include "chrome/common/extensions/extension_action2.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "googleurl/src/gurl.h"
 
 // Represents a Chrome extension.
 class Extension {
  public:
   typedef std::vector<URLPattern> HostPermissions;
@@ skipping 155 matching lines @@
   void set_location(Location location) { location_ = location; }
   const std::string& id() const { return id_; }
   const Version* version() const { return version_.get(); }
   // String representation of the version number.
   const std::string VersionString() const;
   const std::string& name() const { return name_; }
   const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   ExtensionAction* page_action() const { return page_action_.get(); }
-  ExtensionAction* browser_action() const { return browser_action_.get(); }
-  ExtensionActionState* browser_action_state() {
-    return browser_action_state_.get();
-  }
+  ExtensionAction2* browser_action() const { return browser_action_.get(); }
   const std::vector<PrivacyBlacklistInfo>& privacy_blacklists() const {
     return privacy_blacklists_;
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const GURL& background_url() const { return background_url_; }
   const GURL& options_url() const { return options_url_; }
   const std::vector<ToolstripInfo>& toolstrips() const { return toolstrips_; }
   const std::vector<std::string>& api_permissions() const {
     return api_permissions_;
   }
@@ skipping 73 matching lines @@
                             std::string* error,
                             UserScript* result);
 
   // Helper method that loads a ExtensionAction object from a
   // dictionary in the page_action or browser_action section of the manifest.
   ExtensionAction* LoadExtensionActionHelper(
       const DictionaryValue* contextual_action,
       std::string* error,
       ExtensionAction::ExtensionActionType action_type);
 
+  // Helper method to load an ExtensionAction2 from the page_action or
+  // browser_action entries in the manifest.
+  // TODO(aa): ExtensionAction2 should replace ExtensionAction completely.
+  ExtensionAction2* LoadExtensionAction2Helper(
+      const DictionaryValue* extension_action, std::string* error);
+
   // Figures out if a source contains keys not associated with themes - we
   // don't want to allow scripts and such to be bundled with themes.
   bool ContainsNonThemeKeys(const DictionaryValue& source);
 
   // The absolute path to the directory the extension is stored in.
   FilePath path_;
 
   // The base extension url for the extension.
   GURL extension_url_;
 
@@ skipping 17 matching lines @@
   // An optional longer description of the extension.
   std::string description_;
 
   // Paths to the content scripts the extension contains.
   UserScriptList content_scripts_;
 
   // The extension's page action, if any.
   scoped_ptr<ExtensionAction> page_action_;
 
   // The extension's browser action, if any.
-  scoped_ptr<ExtensionAction> browser_action_;
-
-  // The state of the browser action. Valid iff browser_action_ is non-NULL.
-  scoped_ptr<ExtensionActionState> browser_action_state_;
+  scoped_ptr<ExtensionAction2> browser_action_;
 
   // Optional list of privacy blacklistrom.
   std::vector<PrivacyBlacklistInfo> privacy_blacklists_;
 
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional URL to a master page of which a single instance should be always
   // loaded in the background.
   GURL background_url_;
@@ skipping 49 matching lines @@
 
   // True if the background page is ready.
   bool background_page_ready_;
 
   FRIEND_TEST(ExtensionTest, LoadPageActionHelper);
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_