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 26a176056f9409c82fe25719df052bceb1198d5c..80edbb1f8f45621089fe6cb3efe7678d8ea867be 100644 |
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc |
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc |
@@ -33,6 +33,7 @@ |
#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/upgrade_detector.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
@@ -783,13 +784,11 @@ void WrenchMenuModel::CreateZoomMenu(bool new_menu) { |
} |
void WrenchMenuModel::UpdateZoomControls() { |
- bool enable_increment = false; |
- bool enable_decrement = false; |
int zoom_percent = 100; |
if (browser_->tab_strip_model()->GetActiveWebContents()) { |
- zoom_percent = |
- browser_->tab_strip_model()->GetActiveWebContents()->GetZoomPercent( |
- &enable_increment, &enable_decrement); |
+ zoom_percent = ZoomController::FromWebContents( |
+ browser_->tab_strip_model()->GetActiveWebContents()) |
+ ->GetZoomPercent(); |
} |
zoom_label_ = l10n_util::GetStringFUTF16( |
IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |