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

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
index 51c108765d7c96b2033e83c1de1deb395c57e094..24037f0dd8011e196a736e73d6e169f965877a70 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
@@ -38,6 +38,7 @@ 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
@@ -92,6 +93,12 @@ class LocationBarViewMac : public LocationBar,
   // 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;
@@ -104,6 +111,10 @@ class LocationBarViewMac : public LocationBar,
   // 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).
@@ -193,6 +204,9 @@ class LocationBarViewMac : public LocationBar,
   // 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.
@@ -226,6 +240,10 @@ class LocationBarViewMac : public LocationBar,
   // 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_;