Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

chrome/browser/extensions/browser_event_router.cc

Index: chrome/browser/extensions/browser_event_router.cc
diff --git a/chrome/browser/extensions/browser_event_router.cc b/chrome/browser/extensions/browser_event_router.cc
index bf457f9fb319c29063e9f8e87ba6efa479c9df12..cc33832268da0ac2da252a90a1707a744623918e 100644
--- a/chrome/browser/extensions/browser_event_router.cc
+++ b/chrome/browser/extensions/browser_event_router.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
@@ -554,16 +554,16 @@ void BrowserEventRouter::ExtensionActionExecuted(
     WebContents* web_contents) {
   const char* event_name = NULL;
   switch (extension_action.action_type()) {
-    case Extension::ActionInfo::TYPE_BROWSER:
+    case ActionInfo::TYPE_BROWSER:
       event_name = "browserAction.onClicked";
       break;
-    case Extension::ActionInfo::TYPE_PAGE:
+    case ActionInfo::TYPE_PAGE:
       event_name = "pageAction.onClicked";
       break;
-    case Extension::ActionInfo::TYPE_SCRIPT_BADGE:
+    case ActionInfo::TYPE_SCRIPT_BADGE:
       event_name = "scriptBadge.onClicked";
       break;
-    case Extension::ActionInfo::TYPE_SYSTEM_INDICATOR:
+    case ActionInfo::TYPE_SYSTEM_INDICATOR:
       // The System Indicator handles its own clicks.
       break;
   }