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 5881a4115fb8519a203c4ace11b02df96c0bd566..fe1df298d6dab5eafcd776fd269c4dee7078c6f3 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
@@ -24,7 +24,6 @@
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "content/public/browser/notification_observer.h"
@@ -99,20 +98,19 @@ 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);
+  // Shows the bookmark bubble.
+  void ShowZoomBubble();
 
-  // 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);