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

chrome/browser/ui/gtk/browser_window_gtk.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/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 822 matching lines @@
     // the animations are running slowly and this function is called on
     // a timer through LoadingAnimationCallback.
     titlebar_->UpdateThrobber(web_contents);
   }
 }
 
 void BrowserWindowGtk::SetStarredState(bool is_starred) {
   toolbar_->GetLocationBarView()->SetStarred(is_starred);
 }
 
-void BrowserWindowGtk::SetZoomIconState(ZoomController::ZoomIconState state) {
-  toolbar_->GetLocationBarView()->SetZoomIconState(state);
-}
-
-void BrowserWindowGtk::SetZoomIconTooltipPercent(int zoom_percent) {
-  toolbar_->GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent);
-}
-
-void BrowserWindowGtk::ShowZoomBubble(int zoom_percent) {
-  toolbar_->GetLocationBarView()->ShowZoomBubble(zoom_percent);
+void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) {
+  // TODO(dbeam): make sure |can_show_bubble| is forced to false when the wrench
+  // menu is showing.
+  toolbar_->GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble);
 }
 
 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const {
   return restored_bounds_;
 }
 
 gfx::Rect BrowserWindowGtk::GetBounds() const {
   return bounds_;
 }
 
@@ skipping 1689 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }