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

chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/stl_util.h"
@@ skipping 380 matching lines @@
     StartFadeAnimation();
   } else {
     // Cancel any pending animations; switch to the final state immediately.
     StopFadeAnimation();
   }
 #endif
 }
 
 void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
   RefreshContentSettingViews();
-  zoom_view_->Update();
+  ZoomBubbleView::CloseBubble();

[Dan Beam, 2012/08/15 23:26:01]

NOTE: yes, this is just a patch in of
https://chromiumcodereview.appspot.com/10854169/, will resolve when that lands

+  RefreshZoomView();
   RefreshPageActionViews();
 
   bool star_enabled = star_view_ && !model_->input_in_progress() &&
                       edit_bookmarks_enabled_.GetValue();
 
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
   if (star_view_)
     star_view_->SetVisible(star_enabled);
 
   bool enabled = chrome_to_mobile_view_ && !model_->input_in_progress() &&
@@ skipping 87 matching lines @@
   if (star_view_)
     star_view_->SetToggled(on);
   if (action_box_button_view_)
     action_box_button_view_->set_starred(on);
 }
 
 void LocationBarView::ShowStarBubble(const GURL& url, bool newly_bookmarked) {
   chrome::ShowBookmarkBubbleView(star_view_, profile_, url, newly_bookmarked);
 }
 
-void LocationBarView::SetZoomIconTooltipPercent(int zoom_percent) {
-  zoom_view_->SetZoomIconTooltipPercent(zoom_percent);
-}
-
-void LocationBarView::SetZoomIconState(
-    ZoomController::ZoomIconState zoom_icon_state) {
-  zoom_view_->SetZoomIconState(zoom_icon_state);
+void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) {
+  RefreshZoomView();
 
   Layout();
   SchedulePaint();
+
+  if (can_show_bubble && zoom_view_ && zoom_view_->visible())
+    ZoomBubbleView::ShowBubble(zoom_view_, GetTabContents(), true);
 }
 
-void LocationBarView::ShowZoomBubble(int zoom_percent) {
-  ZoomBubbleView::ShowBubble(zoom_view_, GetTabContents(), true);
+void LocationBarView::RefreshZoomView() {
+  TabContents* tab_contents = GetTabContents();
+  if (!zoom_view_ || !tab_contents)
+    return;
+
+  zoom_view_->Update(tab_contents->zoom_controller());
 }
 
 void LocationBarView::ShowChromeToMobileBubble() {
   Browser* browser = GetBrowserFromDelegate(delegate_);
   chrome::ShowChromeToMobileBubbleView(chrome_to_mobile_view_, browser);
 }
 
 gfx::Point LocationBarView::GetLocationEntryOrigin() const {
   gfx::Point origin(location_entry_view_->bounds().origin());
   // If the UI layout is RTL, the coordinate system is not transformed and
@@ skipping 966 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA