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

chrome/browser/ui/views/location_bar/zoom_view.h

Index: chrome/browser/ui/views/location_bar/zoom_view.h
===================================================================
--- chrome/browser/ui/views/location_bar/zoom_view.h	(revision 152086)
+++ chrome/browser/ui/views/location_bar/zoom_view.h	(working copy)
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "ui/views/controls/image_view.h"
 
 namespace views {
@@ -15,8 +16,6 @@
 class MouseEvent;
 }
 
-class ZoomController;
-
 // View for the zoom icon in the Omnibox.
 class ZoomView : public views::ImageView {
  public:
@@ -29,9 +28,12 @@
            LocationBarView::Delegate* location_bar_delegate);
   virtual ~ZoomView();
 
+  void SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state);
+  void SetZoomIconTooltipPercent(int zoom_percent);
+
   // Updates the image and its tooltip appropriately, hiding or showing the icon
   // as needed.
-  void Update(ZoomController* zoom_controller);
+  void Update();
 
  private:
   // views::ImageView:
@@ -48,6 +50,12 @@
   // The delegate used to get the currently visible TabContents.
   LocationBarView::Delegate* location_bar_delegate_;
 
+  // The current icon state.
+  ZoomController::ZoomIconState zoom_icon_state_;
+
+  // The current zoom percentage.
+  int zoom_percent_;
+
   DISALLOW_COPY_AND_ASSIGN(ZoomView);
 };