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

chrome/test/base/test_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_TEST_BASE_TEST_BROWSER_WINDOW_H_
 #define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
@@ skipping 26 matching lines @@
   virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
   virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
   virtual StatusBubble* GetStatusBubble() OVERRIDE;
   virtual void UpdateTitleBar() OVERRIDE {}
   virtual void BookmarkBarStateChanged(
       BookmarkBar::AnimateChangeType change_type) OVERRIDE {}
   virtual void UpdateDevTools() OVERRIDE {}
   virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE {}
   virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE {}
   virtual void SetStarredState(bool is_starred) OVERRIDE {}
-  virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE {}
+  virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE {}
+  virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE {}
+  virtual void ShowZoomBubble(int zoom_percent) OVERRIDE {}
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;
   virtual bool IsMinimized() const OVERRIDE;
   virtual void Maximize() OVERRIDE {}
   virtual void Minimize() OVERRIDE {}
   virtual void Restore() OVERRIDE {}
   virtual void EnterFullscreen(
       const GURL& url, FullscreenExitBubbleType type) OVERRIDE {}
   virtual void ExitFullscreen() OVERRIDE {}
@@ skipping 92 matching lines @@
 
 namespace chrome {
 
 // Helpers that handle the lifetime of TestBrowserWindow instances.
 Browser* CreateBrowserWithTestWindowForProfile(Profile* profile);
 Browser* CreateBrowserWithTestWindowForParams(Browser::CreateParams* params);
 
 }  // namespace chrome
 
 #endif  // CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_