Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: ui/gfx/image/image_ios.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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())

Powered by Google App Engine
This is Rietveld 408576698