Rename ActionBoxController -> LocationBarController.

chrome/browser/extensions/extension_tab_helper.h

Index: chrome/browser/extensions/extension_tab_helper.h
diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h
index 7046863e9f77c30bef301b4cf5e7adc9c2fcf296..82bf519a3ab3565e221abfc3fddbbb1729a036bd 100644
--- a/chrome/browser/extensions/extension_tab_helper.h
+++ b/chrome/browser/extensions/extension_tab_helper.h
@@ -25,7 +25,7 @@ struct LoadCommittedDetails;
 }
 
 namespace extensions {
-class ActionBoxController;
+class LocationBarController;

[not at google - send to devlin, 2012/05/25 22:29:50]

I guess we can worry about reordering stuff as we go along later. Simple sed
ftw.

[Aaron Boodman, 2012/05/26 07:42:18]

I fixed it, let me know if you see others.

 class Extension;
 class ScriptBadgeController;
 class ScriptExecutor;
@@ -99,7 +99,7 @@ class ExtensionTabHelper
 
   extensions::ScriptExecutor* script_executor();
 
-  extensions::ActionBoxController* action_box_controller();
+  extensions::LocationBarController* location_bar_controller();
 
   // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
@@ -188,11 +188,11 @@ class ExtensionTabHelper
 
   TabContentsWrapper* wrapper_;
 
-  // Either script_executor/action_box_controller will have values, or
+  // Either script_executor/location_bar_controller will have values, or
   // script_badge_controller will have a value, depending on whether the action
   // box is turned on.
   scoped_ptr<extensions::ScriptExecutor> script_executor_;
-  scoped_ptr<extensions::ActionBoxController> action_box_controller_;
+  scoped_ptr<extensions::LocationBarController> location_bar_controller_;
   scoped_ptr<extensions::ScriptBadgeController> script_badge_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionTabHelper);