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

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 029e9b96ab05f8cd8a36c32541c34ff5dd8af7dc..424892f3aa49584401d5a7ba90f9f86bb10a43b2 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1997,22 +1997,10 @@ void Browser::URLStarredChanged(TabContents* source, bool starred) {
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, ZoomObserver implementation:
 
-void Browser::OnZoomIconChanged(TabContents* source,
-                                ZoomController::ZoomIconState state) {
-  if (source == chrome::GetActiveTabContents(this))
-    window_->SetZoomIconState(state);
-}
-
-void Browser::OnZoomChanged(TabContents* source,
-                            int zoom_percent,
-                            bool can_show_bubble) {
-  if (source == chrome::GetActiveTabContents(this)) {
-    window_->SetZoomIconTooltipPercent(zoom_percent);
-
-    // Only show the zoom bubble for zoom changes in the active window.
-    if (can_show_bubble && window_->IsActive())
-      window_->ShowZoomBubble(zoom_percent);
-  }
+void Browser::OnZoomChanged(TabContents* source, bool can_show_bubble) {
+  // Only show the zoom bubble for zoom changes in the active window.
+  if (source == chrome::GetActiveTabContents(this) && window_->IsActive())
+    window_->ZoomChangedForActiveTab(can_show_bubble);
 }
 
 ///////////////////////////////////////////////////////////////////////////////