Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/extensions/extension_toolbar_model.cc

Index: chrome/browser/extensions/extension_toolbar_model.cc
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index fd8fa3b246048ba1aa154ba52889d4777422b005..7dea3ac9545b7548fb8918cfaf8ca98cd1f38cdf 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/chrome/browser/extensions/extension_toolbar_model.cc
@@ -11,7 +11,6 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_toolbar_model_factory.h"
@@ -122,23 +121,22 @@ void ExtensionToolbarModel::MoveBrowserAction(const Extension* extension,
   UpdatePrefs();
 }
 
-ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction(
+ExtensionAction::ShowAction ExtensionToolbarModel::ExecuteBrowserAction(
     const Extension* extension,
     Browser* browser,
     GURL* popup_url_out,
     bool should_grant) {
   content::WebContents* web_contents = NULL;
   int tab_id = 0;
-  if (!ExtensionTabUtil::GetDefaultTab(browser, &web_contents, &tab_id)) {
-    return ACTION_NONE;
-  }
+  if (!ExtensionTabUtil::GetDefaultTab(browser, &web_contents, &tab_id))
+    return ExtensionAction::ACTION_NONE;
 
   ExtensionAction* browser_action =
       ExtensionActionManager::Get(profile_)->GetBrowserAction(*extension);
 
   // For browser actions, visibility == enabledness.
   if (!browser_action->GetIsVisible(tab_id))
-    return ACTION_NONE;
+    return ExtensionAction::ACTION_NONE;
 
   if (should_grant) {
     TabHelper::FromWebContents(web_contents)
@@ -149,12 +147,12 @@ ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction(
   if (browser_action->HasPopup(tab_id)) {
     if (popup_url_out)
       *popup_url_out = browser_action->GetPopupUrl(tab_id);
-    return ACTION_SHOW_POPUP;
+    return ExtensionAction::ACTION_SHOW_POPUP;
   }
 
   ExtensionActionAPI::BrowserActionExecuted(
       browser->profile(), *browser_action, web_contents);
-  return ACTION_NONE;
+  return ExtensionAction::ACTION_NONE;
 }
 
 void ExtensionToolbarModel::SetVisibleIconCount(int count) {