Index: ui/gfx/image/image_skia_util_mac.mm |
diff --git a/ui/gfx/image/image_skia_util_mac.mm b/ui/gfx/image/image_skia_util_mac.mm |
index 226953bb77266394e73a94584c9ac6151445482f..f9d0475af7fc1f77c67a63e58a3b0f190177b45f 100644 |
--- a/ui/gfx/image/image_skia_util_mac.mm |
+++ b/ui/gfx/image/image_skia_util_mac.mm |
@@ -10,7 +10,7 @@ |
#import <AppKit/AppKit.h> |
#include "base/mac/mac_util.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/memory/scoped_ptr.h" |
#include "skia/ext/skia_utils_mac.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
@@ -89,7 +89,7 @@ NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) { |
if (image_skia.isNull()) |
return nil; |
- scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
+ base::scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
image_skia.EnsureRepsForSupportedScaleFactors(); |
std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps(); |
for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin(); |
@@ -107,7 +107,7 @@ NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia, |
if (image_skia.isNull()) |
return nil; |
- scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
+ base::scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
image_skia.EnsureRepsForSupportedScaleFactors(); |
std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps(); |
for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin(); |