Move page actions over to ExtensionAction2

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 4a9fcd966b36b3baedfa7b99f0c88874382d4fbe..4677e2dfefff71398965486306b3fcf643636e74 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -191,7 +191,7 @@ class Extension {
   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(); }
+  ExtensionAction2* page_action() const { return page_action_.get(); }
   ExtensionAction2* browser_action() const { return browser_action_.get(); }
   const std::vector<PrivacyBlacklistInfo>& privacy_blacklists() const {
     return privacy_blacklists_;
@@ -281,7 +281,7 @@ class Extension {
 
   // Helper method that loads a ExtensionAction object from a
   // dictionary in the page_action or browser_action section of the manifest.
-  ExtensionAction* LoadExtensionActionHelper(
+  ExtensionAction2* LoadExtensionActionHelper(
       const DictionaryValue* contextual_action,
       std::string* error,
       ExtensionAction::ExtensionActionType action_type);
@@ -326,7 +326,7 @@ class Extension {
   UserScriptList content_scripts_;
 
   // The extension's page action, if any.
-  scoped_ptr<ExtensionAction> page_action_;
+  scoped_ptr<ExtensionAction2> page_action_;
 
   // The extension's browser action, if any.
   scoped_ptr<ExtensionAction2> browser_action_;