Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 10446034: Rename ActionBoxController -> LocationBarController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: grammar Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 6b78ed6507700029341a92188af2ce2d6141dd8c..a47049401eec29c56262bf761a9e3e480f6ea8c0 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -16,10 +16,10 @@
#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"
@@ -1015,8 +1015,8 @@ void LocationBarView::RefreshPageActionViews() {
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());
}

Powered by Google App Engine
This is Rietveld 408576698