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

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.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_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 
 #import <Cocoa/Cocoa.h>
@@ skipping 20 matching lines @@
 class KeywordHintDecoration;
 class LocationBarDecoration;
 class LocationIconDecoration;
 class PageActionDecoration;
 class PlusDecoration;
 class Profile;
 class SelectedKeywordDecoration;
 class SkBitmap;
 class StarDecoration;
 class ToolbarModel;
+class ZoomDecoration;
 
 // A C++ bridge class that represents the location bar UI element to
 // the portable code.  Wires up an OmniboxViewMac instance to
 // the location bar text field, which handles most of the work.
 
 class LocationBarViewMac : public LocationBar,
                            public LocationBarTesting,
                            public OmniboxEditController,
                            public content::NotificationObserver,
                            public CommandObserver {
@@ skipping 34 matching lines @@
   // Set/Get the editable state of the field.
   void SetEditable(bool editable);
   bool IsEditable();
 
   // Set the starred state of the bookmark star.
   void SetStarred(bool starred);
 
   // Set ChromeToMobileDecoration's lit state (to update the icon).
   void SetChromeToMobileDecorationLit(bool lit);
 
+  // Happens when the zoom changes for the active tab. |can_show_bubble| = true
+  // indicates it's worth showing a bubble over this change, where as
+  // |can_show_bubble| = false means it probably wasn't a very interesting
+  // change (e.g. switching tabs, creating a new tab, creating a new browser).

[Kyle Horimoto, 2012/07/24 03:22:28]

Nit: Get rid of the ambiguous "interesting" vs. "not interesting" wording and
simply state when |can_show_bubble| is true or false.

[Dan Beam, 2012/08/15 09:04:59]

Done.

+  void ZoomChangedForActiveTab(bool can_show_bubble);
+
   // Get the point in window coordinates on the star for the bookmark bubble to
   // aim at.
   NSPoint GetBookmarkBubblePoint() const;
 
   // Get the point in window coordinates on the Chrome To Mobile icon for
   // anchoring its bubble.
   NSPoint GetChromeToMobileBubblePoint() const;
 
   // Get the point in window coordinates in the security icon at which the page
   // info bubble aims.
   NSPoint GetPageInfoBubblePoint() const;
 
+  // When any image decorations change, call this to ensure everything is
+  // redrawn and laid out if necessary.
+  void OnImageDecorationsChanged();
+
   // Updates the location bar.  Resets the bar's permanent text and
   // security style, and if |should_restore_state| is true, restores
   // saved state from the tab (for tab switching).
   void Update(const content::WebContents* tab, bool should_restore_state);
 
   // Layout the various decorations which live in the field.
   void Layout();
 
   // Re-draws |decoration| if it's already being displayed.
   void RedrawDecoration(LocationBarDecoration* decoration);
@@ skipping 69 matching lines @@
   bool RefreshContentSettingsDecorations();
 
   void ShowFirstRunBubbleInternal();
 
   // Checks if the bookmark star should be enabled or not.
   bool IsStarEnabled();
 
   // Update the Chrome To Mobile page action visibility and command state.
   void UpdateChromeToMobileEnabled();
 
+  // Updates the zoom decoration in the omnibox with the current zoom level.
+  void UpdateZoomDecoration();
+
   scoped_ptr<OmniboxViewMac> omnibox_view_;
 
   CommandUpdater* command_updater_;  // Weak, owned by Browser.
 
   AutocompleteTextField* field_;  // owned by tab controller
 
   // When we get an OnAutocompleteAccept notification from the autocomplete
   // edit, we save the input string so we can give it back to the browser on
   // the LocationBar interface via GetInputString().
   string16 location_input_;
@@ skipping 13 matching lines @@
 
   // Action "plus" button right of bookmark star.
   scoped_ptr<PlusDecoration> plus_decoration_;
 
   // Bookmark star right of page actions.
   scoped_ptr<StarDecoration> star_decoration_;
 
   // Chrome To Mobile page action icon.
   scoped_ptr<ChromeToMobileDecoration> chrome_to_mobile_decoration_;
 
+  // A zoom icon at the end of the omnibox, which shows at non-standard zoom
+  // levels.
+  scoped_ptr<ZoomDecoration> zoom_decoration_;
+
   // The installed page actions.
   std::vector<ExtensionAction*> page_actions_;
 
   // Decorations for the installed Page Actions.
   ScopedVector<PageActionDecoration> page_action_decorations_;
 
   // The content blocked decorations.
   ScopedVector<ContentSettingDecoration> content_setting_decorations_;
 
   // Keyword hint decoration displayed on the right-hand side.
@@ skipping 14 matching lines @@
   // Used to schedule a task for the first run info bubble.
   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
 
   // Used to change the visibility of the star decoration.
   BooleanPrefMember edit_bookmarks_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_