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 0ac912d53f42edd48af9356dcf1b1a50f2f1cb48..0cd37055769c44f0f3094eebde74d14fe48eac50 100644 |
--- a/chrome/browser/ui/views/toolbar/wrench_menu.cc |
+++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc |
@@ -22,6 +22,7 @@ |
#include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
#include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" |
#include "chrome/browser/ui/views/toolbar/wrench_menu_observer.h" |
+#include "chrome/browser/ui/zoom/zoom_controller.h" |
#include "components/bookmarks/browser/bookmark_model.h" |
#include "content/public/browser/host_zoom_map.h" |
#include "content/public/browser/notification_observer.h" |
@@ -751,15 +752,14 @@ class WrenchMenu::ZoomView : public WrenchMenuView { |
} |
void UpdateZoomControls() { |
- bool enable_increment = false; |
- bool enable_decrement = false; |
WebContents* selected_tab = |
menu()->browser_->tab_strip_model()->GetActiveWebContents(); |
int zoom = 100; |
- if (selected_tab) |
- zoom = selected_tab->GetZoomPercent(&enable_increment, &enable_decrement); |
- increment_button_->SetEnabled(enable_increment); |
- decrement_button_->SetEnabled(enable_decrement); |
+ if (selected_tab) { |
+ zoom = ZoomController::FromWebContents(selected_tab)->GetZoomPercent(); |
+ } |
+ increment_button_->SetEnabled(zoom < selected_tab->GetMaximumZoomPercent()); |
+ decrement_button_->SetEnabled(zoom > selected_tab->GetMinimumZoomPercent()); |
zoom_label_->SetText( |
l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, zoom)); |