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 476 matching lines @@
            page_action_views_.begin();
        iter != page_action_views_.end();
        ++iter) {
     if ((*iter)->page_action() == page_action)
       return (*iter)->widget();
   }
   return NULL;
 }
 
 void LocationBarViewGtk::Update(const WebContents* contents) {
-  UpdateZoomIcon();
+  UpdateZoomIcon(false);
   UpdateStarIcon();
   UpdateChromeToMobileIcon();
   UpdateSiteTypeArea();
   UpdateContentSettingsIcons();
   UpdatePageActions();
   location_entry_->Update(contents);
   // The security level (background color) could have changed, etc.
   if (theme_service_->UsingNativeTheme()) {
     // In GTK mode, we need our parent to redraw, as it draws the text entry
     // border.
@@ skipping 405 matching lines @@
         gtk_alignment_set_padding(GTK_ALIGNMENT(location_entry_alignment_),
                                   kTopMargin + kBorderThickness,
                                   kBottomMargin + kBorderThickness,
                                   top_bottom, top_bottom);
         gtk_alignment_set_padding(GTK_ALIGNMENT(tab_to_search_alignment_),
                                   1, 1, 0, 0);
         gtk_alignment_set_padding(GTK_ALIGNMENT(site_type_alignment_),
                                   1, 1, 0, 0);
       }
 
-      UpdateZoomIcon();
+      UpdateZoomIcon(false);
       UpdateStarIcon();
       UpdateChromeToMobileIcon();
       UpdateSiteTypeArea();
       UpdateContentSettingsIcons();
       break;
     }
 
     default:
       NOTREACHED();
   }
@@ skipping 317 matching lines @@
 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(), browser_->profile(), zoom_percent, true);
+  const ZoomController* zc =
+      TabContents::FromWebContents(GetWebContents())->zoom_controller();

[Evan Stade, 2012/07/13 05:31:00]

why not GetTabContents?

[Dan Beam, 2012/07/24 03:00:49]

Done.

+  ZoomBubbleGtk::Show(
+      zoom_.get(), browser_->profile(), zc->zoom_percent(), 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::ZoomChangedForActiveTab(TabContents* tab_contents,
+                                                 bool can_show_bubble) {
+  UpdateZoomIcon(can_show_bubble);
 }
 
 void LocationBarViewGtk::SetStarred(bool starred) {
   if (starred == starred_)
     return;
 
   starred_ = starred;
   UpdateStarIcon();
 }
 
-void LocationBarViewGtk::UpdateZoomIcon() {
+void LocationBarViewGtk::UpdateZoomIcon(bool can_show_bubble) {
   if (!zoom_.get() || !GetWebContents())
     return;
 
-  const ZoomController* zc = TabContents::FromWebContents(
-      GetWebContents())->zoom_controller();
-
-  if (toolbar_model_->input_in_progress() ||
-      zc->zoom_icon_state() == ZoomController::NONE) {
+  const ZoomController* zc = GetTabContents()->zoom_controller();
+  if (toolbar_model_->input_in_progress() || zc->IsAtDefaultZoom()) {
     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;
+  int zoom_percent = zc->zoom_percent();
+  int zoom_resource = zoom_percent > 100 ? 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,
-                                                   zc->zoom_percent());
+  string16 tooltip =
+      l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent);
   gtk_widget_set_tooltip_text(zoom_.get(), UTF16ToUTF8(tooltip).c_str());
+
+  gtk_widget_show(zoom_.get());
+
+  if (can_show_bubble)
+    ZoomBubbleGtk::Show(zoom_.get(), browser_->profile(), zoom_percent, true);
 }
 
 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 643 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }