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

chrome/browser/ui/browser_window.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_WINDOW_H_
 #define CHROME_BROWSER_UI_BROWSER_WINDOW_H_
 
 #include "base/callback_forward.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/content_settings_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
 class BrowserWindowTesting;
 class DownloadShelf;
 class FindBar;
 class GURL;
 class LocationBar;
@@ skipping 88 matching lines @@
   virtual void SetDevToolsDockSide(DevToolsDockSide side) = 0;
 
   // Update any loading animations running in the window. |should_animate| is
   // true if there are tabs loading and the animations should continue, false
   // if there are no active loads and the animations should end.
   virtual void UpdateLoadingAnimations(bool should_animate) = 0;
 
   // Sets the starred state for the current tab.
   virtual void SetStarredState(bool is_starred) = 0;
 
-  // Called to force the zoom state to for the active tab to be recalculated.
-  // |can_show_bubble| is true when a user presses the zoom up or down keyboard
-  // shortcuts and will be false in other cases (e.g. switching tabs, "clicking"
-  // + or - in the wrench menu to change zoom).
-  virtual void ZoomChangedForActiveTab(bool can_show_bubble) = 0;
+  // Sets the zoom icon state for the current tab.
+  virtual void SetZoomIconState(ZoomController::ZoomIconState state) = 0;
+
+  // Sets the zoom icon tooltip zoom percentage for the current tab.
+  virtual void SetZoomIconTooltipPercent(int zoom_percent) = 0;
+
+  // Show zoom bubble for the current tab.
+  virtual void ShowZoomBubble(int zoom_percent) = 0;
 
   // Accessors for fullscreen mode state.
   virtual void EnterFullscreen(const GURL& url,
                                FullscreenExitBubbleType bubble_type) = 0;
   virtual void ExitFullscreen() = 0;
   virtual void UpdateFullscreenExitBubbleContent(
       const GURL& url,
       FullscreenExitBubbleType bubble_type) = 0;
 
   // Returns true if the fullscreen bubble is visible.
@@ skipping 269 matching lines @@
 
   // Returns the ToolbarView.
   virtual ToolbarView* GetToolbarView() const = 0;
 #endif
 
  protected:
   virtual ~BrowserWindowTesting() {}
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_WINDOW_H_