Update page action manifest parsing to match the new format.

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>
@@ skipping 167 matching lines @@
   const Location location() const { return location_; }
   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_; }
-  const ExtensionActionMap& page_actions() const { return page_actions_; }
+  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();
   }
   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 std::vector<ToolstripInfo>& toolstrips() const { return toolstrips_; }
@@ skipping 14 matching lines @@
   const std::set<std::string> GetEffectiveHostPermissions() const;
 
   // Whether the extension has access to all hosts. This is true if there is
   // a content script that matches all hosts, or if there is a host permission
   // for all hosts.
   bool HasAccessToAllHosts() const;
 
   const GURL& update_url() const { return update_url_; }
   const std::map<int, std::string>& icons() { return icons_; }
 
-  // Retrieves a page action or browser action by |id|.
-  const ExtensionAction* GetExtensionAction(
-    std::string id, ExtensionAction::ExtensionActionType action_type) const;
-
   // Returns the origin of this extension. This function takes a |registry_path|
   // so that the registry location can be overwritten during testing.
   Location ExternalExtensionInstallType(std::string registry_path);
 
   // Theme-related.
   DictionaryValue* GetThemeImages() const { return theme_images_.get(); }
   DictionaryValue* GetThemeColors() const { return theme_colors_.get(); }
   DictionaryValue* GetThemeTints() const { return theme_tints_.get(); }
   DictionaryValue* GetThemeDisplayProperties() const {
     return theme_display_properties_.get();
@@ skipping 39 matching lines @@
   // dictionary in the content_script list of the manifest.
   bool LoadUserScriptHelper(const DictionaryValue* content_script,
                             int definition_index,
                             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,
-      int definition_index,
       std::string* error,
       ExtensionAction::ExtensionActionType action_type);
 
   // 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_;
 
@@ skipping 16 matching lines @@
 
   // The extension's human-readable name.
   std::string name_;
 
   // An optional longer description of the extension.
   std::string description_;
 
   // Paths to the content scripts the extension contains.
   UserScriptList content_scripts_;
 
-  // A list of page actions.
-  ExtensionActionMap page_actions_;
+  // 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_;
 
   // Optional list of privacy blacklistrom.
   std::vector<PrivacyBlacklistInfo> privacy_blacklists_;
 
@@ skipping 52 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_