Index: chrome/browser/ui/cocoa/location_bar/zoom_decoration.h |
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h |
index a856a2f2704c55f1cc584894521dd3c9d1927491..90ef008e6557a84a392a664146cb11d03cd97266 100644 |
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h |
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h |
@@ -13,9 +13,12 @@ |
class LocationBarViewMac; |
@class ZoomBubbleController; |
-class ZoomController; |
class ZoomDecorationTest; |
+namespace ui_zoom { |
+class ZoomController; |
+} |
+ |
// Zoom icon at the end of the omnibox (close to page actions) when at a |
// non-standard zoom level. |
class ZoomDecoration : public ImageDecoration, |
@@ -26,7 +29,7 @@ class ZoomDecoration : public ImageDecoration, |
// Called when this decoration should show or hide itself in its most current |
// state. Returns whether any updates were made. |
- bool UpdateIfNecessary(ZoomController* zoom_controller); |
+ bool UpdateIfNecessary(ui_zoom::ZoomController* zoom_controller); |
// Shows the zoom bubble for this decoration. If |auto_close| is YES, then |
// the bubble will automatically close after a fixed period of time. |
@@ -42,7 +45,7 @@ class ZoomDecoration : public ImageDecoration, |
// Show and update UI associated with the zoom decoration. |
// Virtual and protected for testing. |
- virtual void ShowAndUpdateUI(ZoomController* zoom_controller, |
+ virtual void ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller, |
NSString* tooltip_string); |
private: |