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

chrome/browser/ui/gtk/location_bar_view_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/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1375 matching lines @@
     entry_box_width_ = allocation->width;
     AdjustChildrenVisibility();
   }
 }
 
 gboolean LocationBarViewGtk::OnZoomButtonPress(GtkWidget* widget,
                                                GdkEventButton* event) {
   if (event->button == 1 && GetWebContents()) {
     // If the zoom icon is clicked, show the zoom bubble and keep it open until
     // it loses focus.
-    ZoomBubbleGtk::Show(zoom_.get(), GetTabContents(), false);

[Evan Stade, 2012/08/15 22:01:34]

false is important

[Dan Beam, 2012/08/15 23:13:38]

Done. (reverted this change)

+    ShowZoomBubble();
     return TRUE;
   }
   return FALSE;
 }
 
 gboolean LocationBarViewGtk::OnStarButtonPress(GtkWidget* widget,
                                                GdkEventButton* event) {
   if (event->button == 1) {
     chrome::ExecuteCommand(browser_, IDC_BOOKMARK_PAGE);
     return TRUE;
   }
   return FALSE;
 }
 
 gboolean LocationBarViewGtk::OnChromeToMobileButtonPress(
     GtkWidget* widget,
     GdkEventButton* event) {
   if (event->button == 1) {
     chrome::ExecuteCommand(browser_, IDC_CHROME_TO_MOBILE_PAGE);
     return TRUE;
   }
   return FALSE;
 }
 
-void LocationBarViewGtk::ShowZoomBubble(int zoom_percent) {
+void LocationBarViewGtk::ShowZoomBubble() {
   if (!zoom_.get() || toolbar_model_->input_in_progress())
     return;
 
   ZoomBubbleGtk::Show(zoom_.get(), GetTabContents(), true);
 }
 
 void LocationBarViewGtk::ShowStarBubble(const GURL& url,
                                         bool newly_bookmarked) {
   if (!star_.get())
     return;
 
   BookmarkBubbleGtk::Show(star_.get(), browser_->profile(), url,
                           newly_bookmarked);
 }
 
 void LocationBarViewGtk::ShowChromeToMobileBubble() {
   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;
 
   starred_ = starred;
   UpdateStarIcon();
 }
 
+// TODO(dbeam): make a generic helper that updates both the zoom icon and shows
+// the zoom bubble, if appropriate, for a zoom change.
+void LocationBarViewGtk::ZoomChangedForActiveTab(bool can_show_bubble) {
+  UpdateZoomIcon();
+
+  if (can_show_bubble)
+    ShowZoomBubble();
+}
+
 void LocationBarViewGtk::UpdateZoomIcon() {
-  if (!zoom_.get() || !GetWebContents())
+  TabContents* tab_contents = GetTabContents();
+  if (!zoom_.get() || !tab_contents)
     return;
 
-  const ZoomController* zc = TabContents::FromWebContents(
-      GetWebContents())->zoom_controller();
-
-  if (toolbar_model_->input_in_progress() ||
-      zc->zoom_icon_state() == ZoomController::NONE) {
+  ZoomController* zoom_controller = tab_contents->zoom_controller();
+  if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||
+      toolbar_model_->input_in_progress()) {
     gtk_widget_hide(zoom_.get());
-    ZoomBubbleGtk::Close();
     return;
   }
 
-  gtk_widget_show(zoom_.get());
-  int zoom_resource = zc->zoom_icon_state() == ZoomController::ZOOM_PLUS_ICON ?
-      IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;
+  const int zoom_resource = zoom_controller->GetResourceForZoomLevel();
   gtk_image_set_from_pixbuf(GTK_IMAGE(zoom_image_),
       theme_service_->GetImageNamed(zoom_resource)->ToGdkPixbuf());
 
-  string16 tooltip = l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM,
-                                                   zc->zoom_percent());
+  string16 tooltip = l10n_util::GetStringFUTF16Int(
+      IDS_TOOLTIP_ZOOM, zoom_controller->zoom_percent());
   gtk_widget_set_tooltip_text(zoom_.get(), UTF16ToUTF8(tooltip).c_str());
+
+  gtk_widget_show(zoom_.get());
 }
 
 void LocationBarViewGtk::UpdateStarIcon() {
   if (!star_.get())
     return;
   bool star_enabled = !toolbar_model_->input_in_progress() &&
                       edit_bookmarks_enabled_.GetValue();
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
   if (star_enabled) {
     gtk_widget_show_all(star_.get());
@@ skipping 560 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }