Index: ui/gfx/image/image_ios.mm |
diff --git a/ui/gfx/image/image_ios.mm b/ui/gfx/image/image_ios.mm |
index e2ff8dc0629be65daa47b39b7b4be5bcd83ad28a..01a3c87fbd2ce00c197dafe51f4f948941c3b72a 100644 |
--- a/ui/gfx/image/image_ios.mm |
+++ b/ui/gfx/image/image_ios.mm |
@@ -4,13 +4,13 @@ |
#include "ui/gfx/image/image.h" |
+#import <UIKit/UIKit.h> |
#include <cmath> |
#include <limits> |
-#import <UIKit/UIKit.h> |
#include "base/logging.h" |
#include "base/mac/scoped_cftyperef.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "ui/base/layout.h" |
#include "ui/gfx/image/image_png_rep.h" |
#include "ui/gfx/image/image_skia.h" |
@@ -117,8 +117,8 @@ ImageSkia* ImageSkiaFromPNG( |
// through UIImage. |
gfx::ImageSkia* image_skia = new gfx::ImageSkia(); |
for (size_t i = 0; i < image_png_reps.size(); ++i) { |
- scoped_nsobject<UIImage> uiimage(CreateUIImageFromImagePNGRep( |
- image_png_reps[i])); |
+ base::scoped_nsobject<UIImage> uiimage( |
+ CreateUIImageFromImagePNGRep(image_png_reps[i])); |
gfx::ImageSkiaRep image_skia_rep = ImageSkiaRepOfScaleFactorFromUIImage( |
uiimage, image_png_reps[i].scale_factor); |
if (!image_skia_rep.is_null()) |