Index: chrome/browser/ui/cocoa/history_overlay_controller.mm |
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller.mm b/chrome/browser/ui/cocoa/history_overlay_controller.mm |
index f211afc3a40cc509550b5bdfd48350f47f15f9c2..593a942fa13949051635ab8daa1784ebcc7d654a 100644 |
--- a/chrome/browser/ui/cocoa/history_overlay_controller.mm |
+++ b/chrome/browser/ui/cocoa/history_overlay_controller.mm |
@@ -62,7 +62,7 @@ const CGFloat kGestureCompleteProgress = 0.3; |
NSRect arrowRect = NSMakeRect(offset, 0, kShieldRadius, kShieldHeight); |
arrowRect = NSInsetRect(arrowRect, 10, 0); // Give a little padding. |
- scoped_nsobject<NSImageView> imageView( |
+ base::scoped_nsobject<NSImageView> imageView( |
[[NSImageView alloc] initWithFrame:arrowRect]); |
[imageView setImage:image]; |
[imageView setAutoresizingMask:NSViewMinYMargin | NSViewMaxYMargin]; |
@@ -162,7 +162,7 @@ const CGFloat kGestureCompleteProgress = 0.3; |
NSView* overlay = self.view; |
- scoped_nsobject<CAAnimation> animation( |
+ base::scoped_nsobject<CAAnimation> animation( |
[[overlay animationForKey:@"alphaValue"] copy]); |
[animation setDelegate:self]; |
[animation setDuration:kFadeOutDurationSeconds]; |