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

chrome/browser/ui/gtk/browser_window_gtk.cc

Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 8037ff8b57b6dca5f4fd0756c75e537ce76cf886..9f425082f9ca018a992dd19197abefb940c36279 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -884,16 +884,10 @@ 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 {