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 4890b9e5c04a611e4eda9fdbcb18369dc050475a..484cf47487627f7b21d9372c6b8318a04aff32a9 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -397,7 +397,8 @@ void LocationBarView::ModeChanged(const chrome::search::Mode& mode) {
 
 void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
   RefreshContentSettingViews();
-  zoom_view_->Update();
+  zoom_view_->Update(
+      TabContents::FromWebContents(tab_for_state_restoring)->zoom_controller());
   RefreshPageActionViews();
 
   bool star_enabled = star_view_ && !model_->input_in_progress() &&
@@ -503,20 +504,15 @@ 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) {
+  const ZoomController* zc = GetTabContents()->zoom_controller();
+  zoom_view_->Update(zc);
 
   Layout();
   SchedulePaint();
-}
 
-void LocationBarView::ShowZoomBubble(int zoom_percent) {
-  ZoomBubbleView::ShowBubble(zoom_view_, zoom_percent, true);
+  if (can_show_bubble)
+    ZoomBubbleView::ShowBubble(zoom_view_, zc->zoom_percent(), true);
 }
 
 void LocationBarView::ShowChromeToMobileBubble() {