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

chrome/browser/ui/gtk/location_bar_view_gtk.h

Index: chrome/browser/ui/gtk/location_bar_view_gtk.h
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
index 8ecfa8461d1601528b71f055a955254406af95d4..9f7dbdca4f5beb58616c4af6249172264550a603 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
@@ -98,20 +98,16 @@ class LocationBarViewGtk : public OmniboxEditController,
   // restore saved state that the tab holds.
   void Update(const content::WebContents* tab_for_state_restoring);
 
-  // Show the zoom bubble.
-  void ShowZoomBubble(int zoom_percent);
-
   // Show the bookmark bubble.
   void ShowStarBubble(const GURL& url, bool newly_boomkarked);
 
   // Shows the Chrome To Mobile bubble.
   void ShowChromeToMobileBubble();
 
-  // Sets the tooltip for the zoom icon.
-  void SetZoomIconTooltipPercent(int zoom_percent);
-
-  // Sets the zoom icon state.
-  void SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state);
+  // Happens when the zoom changes for the active tab. |can_show_bubble| will be
+  // true if it was a user action, but the bubble still shouldn't be shown if
+  // the wrench menu is showing.
+  void ZoomChangedForActiveTab(bool can_show_bubble);
 
   // Set the starred state of the bookmark star.
   void SetStarred(bool starred);