Rename ActionBoxController -> LocationBarController.

chrome/browser/ui/views/location_bar/page_action_image_view.cc

 // Copyright (c) 2012 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/location_bar/page_action_image_view.h"
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/extensions/action_box_controller.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 using content::WebContents;
-using extensions::ActionBoxController;
+using extensions::LocationBarController;
 using extensions::Extension;
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
                                          ExtensionAction* page_action,
                                          Browser* browser)
     : owner_(owner),
       page_action_(page_action),
       browser_(browser),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
       current_tab_id_(-1),
@@ skipping 44 matching lines @@
   if (popup_)
     popup_->GetWidget()->RemoveObserver(this);
   HidePopup();
 }
 
 void PageActionImageView::ExecuteAction(int button) {
   TabContentsWrapper* tab_contents = owner_->GetTabContentsWrapper();
   if (!tab_contents)
     return;
 
-  ActionBoxController* controller =
-      tab_contents->extension_tab_helper()->action_box_controller();
+  LocationBarController* controller =
+      tab_contents->extension_tab_helper()->location_bar_controller();
 
   // 1 is left click.
   switch (controller->OnClicked(page_action_->extension_id(), 1)) {
-    case ActionBoxController::ACTION_NONE:
+    case LocationBarController::ACTION_NONE:
       break;
 
-    case ActionBoxController::ACTION_SHOW_POPUP: {
+    case LocationBarController::ACTION_SHOW_POPUP: {
       bool popup_showing = popup_ != NULL;
 
       // Always hide the current popup. Only one popup at a time.
       HidePopup();
 
       // If we were already showing, then treat this click as a dismiss.
       if (popup_showing)
         return;
 
       views::BubbleBorder::ArrowLocation arrow_location = base::i18n::IsRTL() ?
           views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
 
       popup_ = ExtensionPopup::ShowPopup(
           page_action_->GetPopupUrl(current_tab_id_),
           browser_,
           this,
           arrow_location);
       popup_->GetWidget()->AddObserver(this);
       break;
     }
 
-    case ActionBoxController::ACTION_SHOW_CONTEXT_MENU:
+    case 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 ActionBoxController.
+      // mouse button through to the LocationBarController.
       NOTREACHED();
       break;
   }
 }
 
 void PageActionImageView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = UTF8ToUTF16(tooltip_);
 }
 
@@ skipping 148 matching lines @@
   const Extension* unloaded_extension =
       content::Details<extensions::UnloadedExtensionInfo>(details)->extension;
   if (page_action_ == unloaded_extension ->page_action())
     owner_->UpdatePageActions();
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->GetWidget()->Close();
 }