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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/dropdown_bar_host.h"
 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
-#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/drag_controller.h"
 
 #if defined(USE_AURA)
 #include "ui/compositor/layer_animation_observer.h"
 #endif
@@ skipping 143 matching lines @@
   // security style, and, if |tab_for_state_restoring| is non-NULL, also restore
   // saved state that the tab holds.
   void Update(const content::WebContents* tab_for_state_restoring);
 
   // Returns corresponding profile.
   Profile* profile() const { return profile_; }
 
   // Returns the delegate.
   Delegate* delegate() const { return delegate_; }
 
-  // Sets the tooltip for the zoom icon.
-  void SetZoomIconTooltipPercent(int zoom_percent);
-
-  // Sets the zoom icon state.
-  void SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state);
-
-  // Shows the zoom bubble.
-  void ShowZoomBubble(int zoom_percent);
+  // Happens when the zoom is changed for the active tab either by switching the
+  // active tab or a user changing the zoom through a key stroke or via the
+  // wrench menu. |can_show_bubble| will be true if it seems to be a user action
+  // and there are no other things showing in the bubble's way.
+  void ZoomChangedForActiveTab(bool can_show_bubble);
 
   // Sets |preview_enabled| for the PageAction View associated with this
   // |page_action|. If |preview_enabled| is true, the view will display the
   // PageActions icon even though it has not been activated by the extension.
   // This is used by the ExtensionInstalledBubble to preview what the icon
   // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction* page_action,
                                    bool preview_enabled);
 
   // Retrieves the PageAction View which is associated with |page_action|.
@@ skipping 205 matching lines @@
   // actually blocked on the current page.
   void RefreshContentSettingViews();
 
   // Delete all page action views that we have created.
   void DeletePageActionViews();
 
   // Update the views for the Page Actions, to reflect state changes for
   // PageActions.
   void RefreshPageActionViews();
 
+  // Update the view for the zoom icon based on the current tab's zoom.
+  void RefreshZoomView();
+
   // Sets the visibility of view to new_vis.
   void ToggleVisibility(bool new_vis, views::View* view);
 
 #if !defined(USE_AURA)
   // Helper for the Mouse event handlers that does all the real work.
   void OnMouseEvent(const views::MouseEvent& event, UINT msg);
 #endif
 
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText() const;
@@ skipping 126 matching lines @@
 
 #if defined(USE_AURA)
   // Observer for a fade-in animation.
   scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
 #endif
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_