Index: chrome/browser/ui/toolbar/wrench_menu_model.cc |
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc |
index eda373c6fc847a007e71f9571572822919434eed..79e358203430e500496ec8c0100a5f277e59d7b6 100644 |
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc |
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc |
@@ -37,8 +37,6 @@ |
#include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h" |
#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
#include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
-#include "chrome/browser/ui/zoom/zoom_controller.h" |
-#include "chrome/browser/ui/zoom/zoom_event_manager.h" |
#include "chrome/browser/upgrade_detector.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
@@ -48,6 +46,8 @@ |
#include "chrome/grit/generated_resources.h" |
#include "components/signin/core/browser/signin_manager.h" |
#include "components/signin/core/common/profile_management_switches.h" |
+#include "components/ui/zoom/zoom_controller.h" |
+#include "components/ui/zoom/zoom_event_manager.h" |
#include "content/public/browser/host_zoom_map.h" |
#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/notification_service.h" |
@@ -285,10 +285,10 @@ WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider, |
Build(); |
UpdateZoomControls(); |
- browser_zoom_subscription_ = ZoomEventManager::GetForBrowserContext( |
- browser->profile())->AddZoomLevelChangedCallback( |
- base::Bind(&WrenchMenuModel::OnZoomLevelChanged, |
- base::Unretained(this))); |
+ browser_zoom_subscription_ = |
+ ui_zoom::ZoomEventManager::GetForBrowserContext(browser->profile()) |
+ ->AddZoomLevelChangedCallback(base::Bind( |
+ &WrenchMenuModel::OnZoomLevelChanged, base::Unretained(this))); |
tab_strip_model_->AddObserver(this); |
@@ -1068,7 +1068,7 @@ void WrenchMenuModel::CreateZoomMenu() { |
void WrenchMenuModel::UpdateZoomControls() { |
int zoom_percent = 100; |
if (browser_->tab_strip_model()->GetActiveWebContents()) { |
- zoom_percent = ZoomController::FromWebContents( |
+ zoom_percent = ui_zoom::ZoomController::FromWebContents( |
browser_->tab_strip_model()->GetActiveWebContents()) |
->GetZoomPercent(); |
} |