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

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 681 matching lines @@
       // Loads are now complete, update the state if a task was scheduled.
       LoadingAnimationCallback();
     }
   }
 }
 
 void BrowserView::SetStarredState(bool is_starred) {
   GetLocationBarView()->SetStarToggled(is_starred);
 }
 
-void BrowserView::SetZoomIconState(
-    ZoomController::ZoomIconState zoom_icon_state) {
-  GetLocationBarView()->SetZoomIconState(zoom_icon_state);
-}
+void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
+  GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble);
 
-void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) {
-  GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent);
-}
-
-void BrowserView::ShowZoomBubble(int zoom_percent) {
-  GetLocationBarView()->ShowZoomBubble(zoom_percent);
+  // TODO(dbeam): show a zoom bubble when the wrench menu's not showing.
 }
 
 gfx::Rect BrowserView::GetRestoredBounds() const {
   return frame_->GetRestoredBounds();
 }
 
 gfx::Rect BrowserView::GetBounds() const {
   return frame_->GetWindowBoundsInScreen();
 }
 
@@ skipping 1860 matching lines @@
   if (contents && contents->GetContentNativeView() &&
       contents->GetContentNativeView()->HasFocus()) {
     (contents->GetRenderViewHost()->*method)();
     return true;
   }
 #elif defined(OS_WIN)
   // TODO(yusukes): Support non-Aura Windows.
 #endif
   return false;
 }