Revert 152080 - 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
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.h	(revision 152086)
+++ chrome/browser/ui/views/location_bar/location_bar_view.h	(working copy)
@@ -19,6 +19,7 @@
 #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"
@@ -184,9 +185,15 @@
   // Returns the delegate.
   Delegate* delegate() const { return delegate_; }
 
-  // See comment in browser_window.h for more info.
-  void ZoomChangedForActiveTab(bool can_show_bubble);
+  // 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);
+
   // Sets |preview_enabled| for the PageAction View associated with this
   // |page_action|. If |preview_enabled| is true, the view will display the
   // PageActions icon even though it has not been activated by the extension.
@@ -412,9 +419,6 @@
   // 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);