Revert 152080 - Refactor browser window zoom handling and enable zoom icon on all platforms.

chrome/browser/ui/browser_command_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_command_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 881 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_RELOAD_CLEARING_CACHE,
                                         CanReload(browser_));
 
   // Window management commands
   command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB,
       !browser_->is_app() && CanDuplicateTab(browser_));
 
   // Page-related commands
   window()->SetStarredState(
       current_tab_contents->bookmark_tab_helper()->is_starred());
-  window()->ZoomChangedForActiveTab(false);
+  window()->SetZoomIconState(
+      current_tab_contents->zoom_controller()->zoom_icon_state());
+  window()->SetZoomIconTooltipPercent(
+      current_tab_contents->zoom_controller()->zoom_percent());
   command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
                                         CanViewSource(browser_));
   command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION,
                                         CanEmailPageLocation(browser_));
   if (browser_->is_devtools())
     command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, false);
 
   // Changing the encoding is not possible on Chrome-internal webpages.
   NavigationController& nc = current_web_contents->GetController();
   bool is_chrome_internal = HasInternalURL(nc.GetActiveEntry()) ||
@@ skipping 188 matching lines @@
 bool BrowserCommandController::IsFullScreenWindowOpen() {
 #if defined(USE_ASH)
   aura::Window* window = ash::wm::GetActiveWindow();
   return (window && ash::wm::IsWindowFullscreen(window));
 #else
   return false;
 #endif
 }
 
 }  // namespace chrome