Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/ui/views/extensions/extension_action_view_controller.cc

Index: chrome/browser/ui/views/extensions/extension_action_view_controller.cc
diff --git a/chrome/browser/ui/views/extensions/extension_action_view_controller.cc b/chrome/browser/ui/views/extensions/extension_action_view_controller.cc
index 87acea91dfb93abb71ed0a1de95cad3b69444873..791e5fedde181b5d1c3f0fce30d9c682fa6c5d18 100644
--- a/chrome/browser/ui/views/extensions/extension_action_view_controller.cc
+++ b/chrome/browser/ui/views/extensions/extension_action_view_controller.cc
@@ -78,7 +78,7 @@ bool ExtensionActionViewController::ExecuteAction(
         extensions::ExtensionToolbarModel::Get(browser_->profile());
     show_popup = toolbar_model->ExecuteBrowserAction(
                      extension_, browser_, &popup_url, grant_tab_permissions) ==
-                 extensions::ExtensionToolbarModel::ACTION_SHOW_POPUP;
+                 ExtensionAction::ACTION_SHOW_POPUP;
   } else {  // PageAction
     content::WebContents* web_contents = delegate_->GetCurrentWebContents();
     if (!web_contents)
@@ -87,19 +87,12 @@ bool ExtensionActionViewController::ExecuteAction(
         extensions::TabHelper::FromWebContents(web_contents)->
             location_bar_controller();
     switch (controller->OnClicked(extension_action_)) {
-      case extensions::LocationBarController::ACTION_NONE:
+      case ExtensionAction::ACTION_NONE:
         break;
-      case extensions::LocationBarController::ACTION_SHOW_POPUP:
+      case ExtensionAction::ACTION_SHOW_POPUP:
         popup_url = extension_action_->GetPopupUrl(GetCurrentTabId());
         show_popup = true;
         break;
-      case extensions::LocationBarController::ACTION_SHOW_CONTEXT_MENU:
-        // We are never passing OnClicked a right-click button, so assume that
-        // we're never going to be asked to show a context menu.
-        // TODO(kalman): if this changes, update this class to pass the real
-        // mouse button through to the LocationBarController.
-        NOTREACHED();
-        break;
     }
   }