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

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index d045e53e64fff072f5686c2191fd47dc2a414918..c3a90972e583be85896d440f62b6e5d4e97b9c76 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -19,7 +19,6 @@
 #include "chrome/browser/ui/views/dropdown_bar_host.h"
 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
-#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/font.h"
@@ -183,14 +182,11 @@ class LocationBarView : public LocationBar,
   // Returns the delegate.
   Delegate* delegate() const { return delegate_; }
 
-  // Sets the tooltip for the zoom icon.
-  void SetZoomIconTooltipPercent(int zoom_percent);
-
-  // Sets the zoom icon state.
-  void SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state);
-
-  // Shows the zoom bubble.
-  void ShowZoomBubble(int zoom_percent);
+  // Happens when the zoom is changed for the active tab either by switching the
+  // active tab or a user changing the zoom through a key stroke or via the
+  // wrench menu. |can_show_bubble| will be true if it seems to be a user action
+  // and there are no other things showing in the bubble's way.
+  void ZoomChangedForActiveTab(bool can_show_bubble);
 
   // Sets |preview_enabled| for the PageAction View associated with this
   // |page_action|. If |preview_enabled| is true, the view will display the
@@ -416,6 +412,9 @@ class LocationBarView : public LocationBar,
   // PageActions.
   void RefreshPageActionViews();
 
+  // Update the view for the zoom icon based on the current tab's zoom.
+  void RefreshZoomView();
+
   // Sets the visibility of view to new_vis.
   void ToggleVisibility(bool new_vis, views::View* view);