Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
@@ skipping 60 matching lines @@
 
 bool ExtensionActionViewController::ExecuteAction(
     ExtensionPopup::ShowAction show_action, bool grant_tab_permissions) {
   GURL popup_url;
   bool show_popup = false;
   if (extension_action_->action_type() == ActionInfo::TYPE_BROWSER) {
     extensions::ExtensionToolbarModel* toolbar_model =
         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)
       return false;
     extensions::LocationBarController* controller =
         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;
     }
   }
 
   if (show_popup && ShowPopupWithUrl(show_action, popup_url)) {
     delegate_->OnPopupShown(grant_tab_permissions);
     return true;
   }
 
   return false;
 }
@@ skipping 223 matching lines @@
 }
 
 void ExtensionActionViewController::CleanupPopup(bool close_widget) {
   DCHECK(popup_);
   delegate_->CleanupPopup();
   popup_->GetWidget()->RemoveObserver(this);
   if (close_widget)
     popup_->GetWidget()->Close();
   popup_ = NULL;
 }