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
diff --git a/chrome/browser/ui/views/location_bar/zoom_view.h b/chrome/browser/ui/views/location_bar/zoom_view.h
index 90490bb2e2f7b5fd0b953eccf04ac016e4a9b879..d117bf88fba20e2bc903398644f58f5c0dddd51e 100644
--- a/chrome/browser/ui/views/location_bar/zoom_view.h
+++ b/chrome/browser/ui/views/location_bar/zoom_view.h
@@ -8,7 +8,6 @@
 #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 {
@@ -16,6 +15,8 @@ class KeyEvent;
 class MouseEvent;
 }
 
+class ZoomController;
+
 // View for the zoom icon in the Omnibox.
 class ZoomView : public views::ImageView {
  public:
@@ -28,12 +29,9 @@ class ZoomView : public views::ImageView {
            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();
+  void Update(ZoomController* zoom_controller);
 
  private:
   // views::ImageView:
@@ -50,12 +48,6 @@ class ZoomView : public views::ImageView {
   // 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);
 };