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

chrome/browser/ui/zoom/zoom_observer.h

Index: chrome/browser/ui/zoom/zoom_observer.h
===================================================================
--- chrome/browser/ui/zoom/zoom_observer.h	(revision 152086)
+++ chrome/browser/ui/zoom/zoom_observer.h	(working copy)
@@ -5,13 +5,21 @@
 #ifndef CHROME_BROWSER_UI_ZOOM_ZOOM_OBSERVER_H_
 #define CHROME_BROWSER_UI_ZOOM_ZOOM_OBSERVER_H_
 
+#include "chrome/browser/ui/zoom/zoom_controller.h"
+
 class TabContents;
 
 // Interface for objects that wish to be notified of changes in ZoomController.
 class ZoomObserver {
  public:
+  // Notification that the Omnibox zoom icon should change.
+  virtual void OnZoomIconChanged(TabContents* source,
+                                 ZoomController::ZoomIconState state) = 0;
+
   // Notification that the zoom percentage has changed.
-  virtual void OnZoomChanged(TabContents* source, bool can_show_bubble) = 0;
+  virtual void OnZoomChanged(TabContents* source,
+                             int zoom_percent,
+                             bool can_show_bubble) = 0;
 
  protected:
   virtual ~ZoomObserver() {}