Rename ActionBoxController -> LocationBarController.

chrome/browser/extensions/extension_tab_helper.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/extensions/extension_tab_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/page_action_controller.h"
 #include "chrome/browser/extensions/script_badge_controller.h"
 #include "chrome/browser/extensions/script_executor_impl.h"
@@ skipping 35 matching lines @@
     : content::WebContentsObserver(wrapper->web_contents()),
       delegate_(NULL),
       extension_app_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(wrapper->profile(), this)),
       wrapper_(wrapper) {
   if (extensions::switch_utils::IsActionBoxEnabled()) {
     script_badge_controller_.reset(new ScriptBadgeController(wrapper));
   } else {
     script_executor_.reset(new ScriptExecutorImpl(wrapper->web_contents()));
-    action_box_controller_.reset(new PageActionController(wrapper));
+    location_bar_controller_.reset(new PageActionController(wrapper));
   }
 }
 
 ExtensionTabHelper::~ExtensionTabHelper() {
 }
 
 void ExtensionTabHelper::CopyStateFrom(const ExtensionTabHelper& source) {
   SetExtensionApp(source.extension_app());
   extension_app_icon_ = source.extension_app_icon_;
 }
@@ skipping 39 matching lines @@
 
   return &extension_app_icon_;
 }
 
 extensions::ScriptExecutor* ExtensionTabHelper::script_executor() {
   if (script_badge_controller_.get())
     return script_badge_controller_.get();
   return script_executor_.get();
 }
 
-extensions::ActionBoxController* ExtensionTabHelper::action_box_controller() {
+extensions::LocationBarController*
+    ExtensionTabHelper::location_bar_controller() {
   if (script_badge_controller_.get())
     return script_badge_controller_.get();
-  return action_box_controller_.get();
+  return location_bar_controller_.get();
 }
 
 void ExtensionTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ skipping 237 matching lines @@
 void ExtensionTabHelper::OnInlineInstallFailure(int install_id,
                                                 int return_route_id,
                                                 const std::string& error) {
   Send(new ExtensionMsg_InlineWebstoreInstallResponse(
       return_route_id, install_id, false, error));
 }
 
 WebContents* ExtensionTabHelper::GetAssociatedWebContents() const {
   return web_contents();
 }