Rename ActionBoxController -> LocationBarController.

chrome/browser/ui/views/location_bar/location_bar_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/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.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/defaults.h"
-#include "chrome/browser/extensions/action_box_controller.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/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_finder.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
@@ skipping 218 matching lines @@
       chrome_to_mobile_view_ = new ChromeToMobileView(this, command_updater_);
       AddChildView(chrome_to_mobile_view_);
       ChromeToMobileService* service =
           ChromeToMobileServiceFactory::GetForProfile(profile_);
       service->RequestMobileListUpdate();
       chrome_to_mobile_view_->SetVisible(service->HasDevices());
     }
   }
 
   registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_ACTION_BOX_UPDATED,
+                 chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
                  content::Source<Profile>(profile_));
 
   // Initialize the location entry. We do this to avoid a black flash which is
   // visible when the location entry has just been initialized.
   Update(NULL);
 
   OnChanged();
 }
 
 bool LocationBarView::IsInitialized() const {
@@ skipping 736 matching lines @@
   std::map<ExtensionAction*, bool> old_visibility;
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     old_visibility[(*i)->image_view()->page_action()] = (*i)->visible();
   }
 
   std::vector<ExtensionAction*> page_actions;
 
   TabContentsWrapper* tab_contents = GetTabContentsWrapper();
   if (tab_contents) {
-    extensions::ActionBoxController* controller =
-        tab_contents->extension_tab_helper()->action_box_controller();
+    extensions::LocationBarController* controller =
+        tab_contents->extension_tab_helper()->location_bar_controller();
     page_actions.swap(*controller->GetCurrentActions());
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
   if (page_actions.size() != page_action_views_.size()) {
     DeletePageActionViews();  // Delete the old views (if any).
 
     page_action_views_.resize(page_actions.size());
     View* right_anchor = chrome_to_mobile_view_;
@@ skipping 267 matching lines @@
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PREF_CHANGED: {
       std::string* name = content::Details<std::string>(details).ptr();
       if (*name == prefs::kEditBookmarksEnabled)
         Update(NULL);
       break;
     }
 
-    case chrome::NOTIFICATION_EXTENSION_ACTION_BOX_UPDATED: {
+    case 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();
       if (target_tab == GetTabContentsWrapper())
         UpdatePageActions();
       break;
     }
 
     default:
       NOTREACHED() << "Unexpected notification.";
@@ skipping 11 matching lines @@
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif