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

chrome/browser/ui/browser_window.h

Index: chrome/browser/ui/browser_window.h
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h
index 28bbf6f80b0b7e386a31a7697b5fa0f96d9e4e57..4a163e1678f5a5b80a4aa8152acc0a5d8da92d99 100644
--- a/chrome/browser/ui/browser_window.h
+++ b/chrome/browser/ui/browser_window.h
@@ -11,7 +11,6 @@
 #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"
@@ -123,14 +122,11 @@ class BrowserWindow : public BaseWindow {
   // Sets the starred state for the current tab.
   virtual void SetStarredState(bool is_starred) = 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;
+  // Called when the zoom in the active tab is changed. |can_show_bubble| will
+  // be true if showing a zoom bubble would be appropriate (i.e. the change was
+  // based on a user action, not switching tabs nor from the zoom widget in the
+  // wrench menu).
+  virtual void ZoomChangedForActiveTab(bool can_show_bubble) = 0;
 
   // Accessors for fullscreen mode state.
   virtual void EnterFullscreen(const GURL& url,