Index: chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm |
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm |
index 876ac6dfdc33bb3f77332737852c11322b215382..92f6b8956e7d2ec6aea98d273a35e3b0daa0248a 100644 |
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm |
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm |
@@ -7,7 +7,7 @@ |
#include <cmath> |
#include "base/logging.h" |
-#import "base/memory/scoped_nsobject.h" |
+#import "base/mac/scoped_nsobject.h" |
#include "chrome/browser/bookmarks/bookmark_model.h" |
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" |
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" |
@@ -415,10 +415,11 @@ BookmarkButton* gDraggedButton = nil; // Weak |
// if the source view is clipped. Fortunately, we don't display clipped |
// bookmark buttons. |
[self lockFocus]; |
- scoped_nsobject<NSBitmapImageRep> |
- bitmap([[NSBitmapImageRep alloc] initWithFocusedViewRect:bounds]); |
+ base::scoped_nsobject<NSBitmapImageRep> bitmap( |
+ [[NSBitmapImageRep alloc] initWithFocusedViewRect:bounds]); |
[self unlockFocus]; |
- scoped_nsobject<NSImage> image([[NSImage alloc] initWithSize:[bitmap size]]); |
+ base::scoped_nsobject<NSImage> image( |
+ [[NSImage alloc] initWithSize:[bitmap size]]); |
[image addRepresentation:bitmap]; |
// Make an autoreleased |NSImage|, which will be returned, and draw into it. |