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

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index e18b1183ad24c99b1cd562e194c0d77a7bfe3484..a90fc8381d9106babd84fb83253a048b0bdf991c 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -398,7 +398,8 @@ void LocationBarView::ModeChanged(const chrome::search::Mode& old_mode,
 
 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() &&
@@ -506,20 +507,22 @@ 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() {