| Index: content/browser/web_contents/web_drag_source_mac.h
|
| diff --git a/content/browser/web_contents/web_drag_source_mac.h b/content/browser/web_contents/web_drag_source_mac.h
|
| index e17255146f3ec225dead74cb1dc329b4f1e8e282..87fb2b6c13fab2cd1b503715fc18382709d827dd 100644
|
| --- a/content/browser/web_contents/web_drag_source_mac.h
|
| +++ b/content/browser/web_contents/web_drag_source_mac.h
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/mac/scoped_cftyperef.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -31,13 +31,13 @@ CONTENT_EXPORT
|
| scoped_ptr<WebDropData> dropData_;
|
|
|
| // The image to show as drag image. Can be nil.
|
| - scoped_nsobject<NSImage> dragImage_;
|
| + base::scoped_nsobject<NSImage> dragImage_;
|
|
|
| // The offset to draw |dragImage_| at.
|
| NSPoint imageOffset_;
|
|
|
| // Our pasteboard.
|
| - scoped_nsobject<NSPasteboard> pasteboard_;
|
| + base::scoped_nsobject<NSPasteboard> pasteboard_;
|
|
|
| // A mask of the allowed drag operations.
|
| NSDragOperation dragOperationMask_;
|
|
|