Move BrowserAction out of Extension

chrome/common/extensions/api/extension_action/action_info.h

Index: chrome/common/extensions/api/extension_action/action_info.h
diff --git a/chrome/common/extensions/api/extension_action/action_info.h b/chrome/common/extensions/api/extension_action/action_info.h
index 09e7eccf78176cd60113e2ce9ec1dfc9e0c541ff..c17759a415c8ee8c00494a36bab295739fd827ac 100644
--- a/chrome/common/extensions/api/extension_action/action_info.h
+++ b/chrome/common/extensions/api/extension_action/action_info.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "googleurl/src/gurl.h"
 
@@ -26,12 +27,17 @@ struct ActionInfo {
     TYPE_SYSTEM_INDICATOR,
   };
 
-  // Returns the appropriate ActionInfo for the given |extension|.
-  static const ActionInfo* GetScriptBadgeInfo(const Extension* extension);
+  // Returns the extension's browser action, if any.
+  static const ActionInfo* GetBrowserActionInfo(const Extension* extension);
 
-  // Sets the appropriate ActionInfo as ManifestData for the given |extension|.
-  // This is static since |extension| takes ownership of |info|.
-  static void SetScriptBadgeInfo(Extension* extension, ActionInfo* info);
+  // Returns the extension's script badge.
+  static const ActionInfo* GetScriptBadgeInfo(const Extension* etxension);
+
+  // Sets the extension's browser action. |extension| takes ownership of |info|.
+  static void SetBrowserActionInfo(Extension* extension, ActionInfo* info);
+
+  // Sets the extension's script badge. |extension| takes ownership of |info|.
+  static void SetScriptBadgeInfo(Extension* etxension, ActionInfo* info);
 
   // Empty implies the key wasn't present.
   ExtensionIconSet default_icon;