Rename ActionBoxController -> LocationBarController.

chrome/browser/ui/gtk/location_bar_view_gtk.cc

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 7a13f8166f1951b1c7b8423502d1dc8132df4fe7..cdcf09096c74bae46e8baa669f96c2bd711350b4 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -24,13 +24,13 @@
 #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"
@@ -84,7 +84,7 @@
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::WebContents;
-using extensions::ActionBoxController;
+using extensions::LocationBarController;
 using extensions::Extension;
 
 namespace {
@@ -359,7 +359,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
                  chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_service_));
   registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_ACTION_BOX_UPDATED,
+                 chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
                  content::Source<Profile>(browser()->profile()));
   edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled,
                                profile->GetPrefs(), this);
@@ -694,8 +694,8 @@ void LocationBarViewGtk::UpdatePageActions() {
 
   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());
   }
 
@@ -814,7 +814,7 @@ void LocationBarViewGtk::Observe(int type,
     return;
   }
 
-  if (type == chrome::NOTIFICATION_EXTENSION_ACTION_BOX_UPDATED) {
+  if (type == chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED) {
     // Only update if the updated action box was for the active tab contents.
     TabContentsWrapper* target_tab =
         content::Details<TabContentsWrapper>(details).ptr();
@@ -1764,21 +1764,21 @@ gboolean LocationBarViewGtk::PageActionViewGtk::OnButtonPressed(
   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(