Implements a zoom icon in the Omnibox for Views.

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index ea2a195a133123d7f7f06f7f2a8f8738d050bc6e..1ae11a5a85a8195dfa3129cd8f9288ab6a4a18dd 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -19,6 +19,7 @@
 #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"
@@ -48,6 +49,7 @@ class PageActionImageView;
 class Profile;
 class SelectedKeywordView;
 class StarView;
+class ZoomView;

[Peter Kasting, 2012/06/22 20:16:20]

Nit: This should be at the end of the list (alphabetical order)

[Kyle Horimoto, 2012/06/26 21:55:53]

Done.

 class TabContents;
 typedef TabContents TabContentsWrapper;
 class TemplateURLService;
@@ -191,6 +193,15 @@ class LocationBarView : public LocationBar,
   // Shows the bookmark bubble.
   void ShowStarBubble(const GURL& url, bool newly_bookmarked);
 
+  // Sets the tooltip for the zoom icon.
+  void SetZoomIconTooltipPercent(int zoom_percent);
+
+  // Sets the zoom icon state.
+  void SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state);
+
+  // Show the zoom bubble.
+  void ShowZoomBubble(int zoom_percent);
+
   // Shows the Chrome To Mobile bubble.
   void ShowChromeToMobileBubble();
 
@@ -466,6 +477,9 @@ class LocationBarView : public LocationBar,
   // The star.
   StarView* star_view_;
 
+  // The zoom icon.

[Peter Kasting, 2012/06/22 20:16:20]

Shouldn't this icon be placed next to the content settings icons, since it
functions very similarly (in being a state indicator that appears when the state
of a page differs from the default)?

[Kyle Horimoto, 2012/06/26 21:55:53]

Done. Makes sense - I had just put it by the StarView previously since they are
laid out next to each other.

+  ZoomView* zoom_view_;
+
   // The action box button (plus).
   ActionBoxButtonView* action_box_button_view_;