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 615082da38beb47ff465fd749a8832d12d638981..6ed7249d49daf88facfd9e135fc16fc5a9b45398 100644
--- a/chrome/browser/ui/views/location_bar/zoom_view.h
+++ b/chrome/browser/ui/views/location_bar/zoom_view.h
@@ -22,12 +22,9 @@ class ZoomView : public views::ImageView {
   explicit ZoomView(ToolbarModel* toolbar_model);
   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:
@@ -41,12 +38,6 @@ class ZoomView : public views::ImageView {
   // Toolbar model used to test whether location bar input is in progress.
   ToolbarModel* toolbar_model_;
 
-  // The current icon state.
-  ZoomController::ZoomIconState zoom_icon_state_;
-
-  // The current zoom percentage.
-  int zoom_percent_;
-
   DISALLOW_COPY_AND_ASSIGN(ZoomView);
 };