Move BrowserAction out of Extension

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

Index: chrome/common/extensions/api/extension_action/action_info.cc
diff --git a/chrome/common/extensions/api/extension_action/action_info.cc b/chrome/common/extensions/api/extension_action/action_info.cc
index b1c3d7af7b5a0d8d12d36672f70e99bf0ba4fa9c..ff40f068623a84b383f2e7a618b51cc1aacc12a8 100644
--- a/chrome/common/extensions/api/extension_action/action_info.cc
+++ b/chrome/common/extensions/api/extension_action/action_info.cc
@@ -3,10 +3,38 @@
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
 
 namespace extensions {
 
+namespace {
+
+static const ActionInfo* GetActionInfo(const Extension* extension,
+                                       const std::string& key) {
+  ActionInfoData* data = static_cast<ActionInfoData*>(
+      extension->GetManifestData(key));
+  return data ? data->action_info.get() : NULL;
+}
+
+}  // namespace
+
 ActionInfo::ActionInfo() {}
 ActionInfo::~ActionInfo() {}
 
+ActionInfoData::ActionInfoData(ActionInfo* info) : action_info(info) {
+}
+
+ActionInfoData::~ActionInfoData() {
+}
+
+const ActionInfo* ActionInfoData::GetBrowserActionInfo(
+    const Extension* extension) {
+  return GetActionInfo(extension, extension_manifest_keys::kBrowserAction);
+}
+
+const ActionInfo* ActionInfoData::GetScriptBadgeInfo(
+    const Extension* extension) {
+  return GetActionInfo(extension, extension_manifest_keys::kScriptBadge);
+}
+
 }  // namespace extensions