Rename ActionBoxController -> LocationBarController.

chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/accessibility/accessibility_events.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/chrome_to_mobile_service.h"
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.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_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/favicon/favicon_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
@@ skipping 33 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 #include "webkit/glue/window_open_disposition.h"
 
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::WebContents;
-using extensions::ActionBoxController;
+using extensions::LocationBarController;
 using extensions::Extension;
 
 namespace {
 
 // We are positioned with a little bit of extra space that we don't use now.
 const int kTopMargin = 1;
 const int kBottomMargin = 1;
 const int kLeftMargin = 1;
 const int kRightMargin = 1;
 // We draw a border on the top and bottom (but not on left or right).
@@ skipping 589 matching lines @@
   // If there are no visible content things, hide the top level box so it
   // doesn't mess with padding.
   gtk_widget_set_visible(content_setting_hbox_.get(), any_visible);
 }
 
 void LocationBarViewGtk::UpdatePageActions() {
   std::vector<ExtensionAction*> page_actions;
 
   TabContentsWrapper* tab_contents = GetTabContentsWrapper();
   if (tab_contents) {
-    ActionBoxController* controller =
-        tab_contents->extension_tab_helper()->action_box_controller();
+    LocationBarController* controller =
+        tab_contents->extension_tab_helper()->location_bar_controller();
     page_actions.swap(*controller->GetCurrentActions());
   }
 
   // Initialize on the first call, or re-inialize if more extensions have been
   // loaded or added after startup.
   if (page_actions.size() != page_action_views_.size()) {
     page_action_views_.reset();  // Delete the old views (if any).
 
     for (size_t i = 0; i < page_actions.size(); ++i) {
       page_action_views_.push_back(
@@ skipping 1048 matching lines @@
   ExtensionService* extension_service =
       owner_->browser()->profile()->GetExtensionService();
   if (!extension_service)
     return TRUE;
 
   const Extension* extension =
       extension_service->extensions()->GetByID(page_action()->extension_id());
   if (!extension)
     return TRUE;
 
-  ActionBoxController* controller =
-      tab_contents->extension_tab_helper()->action_box_controller();
+  LocationBarController* controller =
+      tab_contents->extension_tab_helper()->location_bar_controller();
 
   switch (controller->OnClicked(extension->id(), event->button)) {
-    case ActionBoxController::ACTION_NONE:
+    case LocationBarController::ACTION_NONE:
       break;
 
-    case ActionBoxController::ACTION_SHOW_POPUP:
+    case LocationBarController::ACTION_SHOW_POPUP:
       ExtensionPopupGtk::Show(
           page_action_->GetPopupUrl(current_tab_id_),
           owner_->browser_,
           event_box_.get());
       break;
 
-    case ActionBoxController::ACTION_SHOW_CONTEXT_MENU:
+    case LocationBarController::ACTION_SHOW_CONTEXT_MENU:
       context_menu_model_ =
           new ExtensionContextMenuModel(extension, owner_->browser_);
       context_menu_.reset(
           new MenuGtk(NULL, context_menu_model_.get()));
       context_menu_->PopupForWidget(sender, event->button, event->time);
       break;
   }
 
   return TRUE;
 }
@@ skipping 33 matching lines @@
     GdkModifierType modifier,
     void* user_data) {
   PageActionViewGtk* view = static_cast<PageActionViewGtk*>(user_data);
   if (!gtk_widget_get_visible(view->widget()))
     return FALSE;
 
   GdkEventButton event = {};
   event.button = 1;
   return view->OnButtonPressed(view->widget(), &event);
 }