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

chrome/browser/ui/gtk/location_bar_view_gtk.cc

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/location_bar_view_gtk.cc	(revision 152086)
+++ chrome/browser/ui/gtk/location_bar_view_gtk.cc	(working copy)
@@ -1502,7 +1502,7 @@
   return FALSE;
 }
 
-void LocationBarViewGtk::ShowZoomBubble() {
+void LocationBarViewGtk::ShowZoomBubble(int zoom_percent) {
   if (!zoom_.get() || toolbar_model_->input_in_progress())
     return;
 
@@ -1522,6 +1522,15 @@
   ChromeToMobileBubbleGtk::Show(GTK_IMAGE(chrome_to_mobile_image_), browser_);
 }
 
+void LocationBarViewGtk::SetZoomIconTooltipPercent(int zoom_percent) {
+  UpdateZoomIcon();
+}
+
+void LocationBarViewGtk::SetZoomIconState(
+    ZoomController::ZoomIconState zoom_icon_state) {
+  UpdateZoomIcon();
+}
+
 void LocationBarViewGtk::SetStarred(bool starred) {
   if (starred == starred_)
     return;
@@ -1530,36 +1539,29 @@
   UpdateStarIcon();
 }
 
-void LocationBarViewGtk::ZoomChangedForActiveTab(bool can_show_bubble) {
-  UpdateZoomIcon();
-
-  // TODO(dbeam): don't show bubble if the wrench menu is showing.
-  if (can_show_bubble && gtk_widget_get_visible(zoom_.get()))
-    ShowZoomBubble();
-}
-
 void LocationBarViewGtk::UpdateZoomIcon() {
-  TabContents* tab_contents = GetTabContents();
-  if (!zoom_.get() || !tab_contents)
+  if (!zoom_.get() || !GetWebContents())
     return;
 
-  ZoomController* zoom_controller = tab_contents->zoom_controller();
-  if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||
-      toolbar_model_->input_in_progress()) {
+  const ZoomController* zc = TabContents::FromWebContents(
+      GetWebContents())->zoom_controller();
+
+  if (toolbar_model_->input_in_progress() ||
+      zc->zoom_icon_state() == ZoomController::NONE) {
     gtk_widget_hide(zoom_.get());
     ZoomBubbleGtk::Close();
     return;
   }
 
-  const int zoom_resource = zoom_controller->GetResourceForZoomLevel();
+  gtk_widget_show(zoom_.get());
+  int zoom_resource = zc->zoom_icon_state() == ZoomController::ZOOM_PLUS_ICON ?
+      IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;
   gtk_image_set_from_pixbuf(GTK_IMAGE(zoom_image_),
       theme_service_->GetImageNamed(zoom_resource)->ToGdkPixbuf());
 
-  string16 tooltip = l10n_util::GetStringFUTF16Int(
-      IDS_TOOLTIP_ZOOM, zoom_controller->zoom_percent());
+  string16 tooltip = l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM,
+                                                   zc->zoom_percent());
   gtk_widget_set_tooltip_text(zoom_.get(), UTF16ToUTF8(tooltip).c_str());
-
-  gtk_widget_show(zoom_.get());
 }
 
 void LocationBarViewGtk::UpdateStarIcon() {