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

Unified Diff: chrome/browser/ui/views/toolbar/wrench_menu.cc

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete defines in build files. Created 6 years 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/toolbar/wrench_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.cc b/chrome/browser/ui/views/toolbar/wrench_menu.cc
index 2b6f6aea2727c035d4993fb621139189183a37c1..eac7619b7188bc29e5239e715320e223215a577e 100644
--- a/chrome/browser/ui/views/toolbar/wrench_menu.cc
+++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc
@@ -24,10 +24,10 @@
#include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
#include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h"
#include "chrome/browser/ui/views/toolbar/wrench_menu_observer.h"
-#include "chrome/browser/ui/zoom/zoom_controller.h"
-#include "chrome/browser/ui/zoom/zoom_event_manager.h"
#include "chrome/grit/generated_resources.h"
#include "components/bookmarks/browser/bookmark_model.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/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -494,10 +494,12 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
decrement_button_(NULL),
fullscreen_button_(NULL),
zoom_label_width_(0) {
- browser_zoom_subscription_ = ZoomEventManager::GetForBrowserContext(
- menu->browser_->profile())->AddZoomLevelChangedCallback(
- base::Bind(&WrenchMenu::ZoomView::OnZoomLevelChanged,
- base::Unretained(this)));
+ browser_zoom_subscription_ =
+ ui_zoom::ZoomEventManager::GetForBrowserContext(
+ menu->browser_->profile())
+ ->AddZoomLevelChangedCallback(
+ base::Bind(&WrenchMenu::ZoomView::OnZoomLevelChanged,
+ base::Unretained(this)));
decrement_button_ = CreateButtonWithAccName(
IDS_ZOOM_MINUS2, InMenuButtonBackground::LEFT_BUTTON,
@@ -638,7 +640,8 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
menu()->browser_->tab_strip_model()->GetActiveWebContents();
int zoom = 100;
if (selected_tab)
- zoom = ZoomController::FromWebContents(selected_tab)->GetZoomPercent();
+ zoom = ui_zoom::ZoomController::FromWebContents(selected_tab)
+ ->GetZoomPercent();
increment_button_->SetEnabled(zoom < selected_tab->GetMaximumZoomPercent());
decrement_button_->SetEnabled(zoom > selected_tab->GetMinimumZoomPercent());
zoom_label_->SetText(
« no previous file with comments | « chrome/browser/ui/views/location_bar/zoom_view.cc ('k') | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698