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

Unified Diff: ui/gfx/image/image.cc

Issue 2259753003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « ui/events/x/events_x_unittest.cc ('k') | ui/gl/gl_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image.cc
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index aa3f2b33e6d32e14de1435b0e3cc622a3d16e3e4..d7c67ccd65a7274d3ce6865aba7e4284d5c22b8c 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -408,14 +408,14 @@ Image::Image(const std::vector<ImagePNGRep>& image_reps) {
return;
storage_ = new internal::ImageStorage(Image::kImageRepPNG);
- AddRepresentation(base::WrapUnique(new internal::ImageRepPNG(filtered)));
+ AddRepresentation(base::MakeUnique<internal::ImageRepPNG>(filtered));
}
Image::Image(const ImageSkia& image) {
if (!image.isNull()) {
storage_ = new internal::ImageStorage(Image::kImageRepSkia);
AddRepresentation(
- base::WrapUnique(new internal::ImageRepSkia(new ImageSkia(image))));
+ base::MakeUnique<internal::ImageRepSkia>(new ImageSkia(image)));
}
}
@@ -423,14 +423,13 @@ Image::Image(const ImageSkia& image) {
Image::Image(UIImage* image)
: storage_(new internal::ImageStorage(Image::kImageRepCocoaTouch)) {
if (image)
- AddRepresentation(
- base::WrapUnique(new internal::ImageRepCocoaTouch(image)));
+ AddRepresentation(base::MakeUnique<internal::ImageRepCocoaTouch>(image));
}
#elif defined(OS_MACOSX)
Image::Image(NSImage* image) {
if (image) {
storage_ = new internal::ImageStorage(Image::kImageRepCocoa);
- AddRepresentation(base::WrapUnique(new internal::ImageRepCocoa(image)));
+ AddRepresentation(base::MakeUnique<internal::ImageRepCocoa>(image));
}
}
#endif
« no previous file with comments | « ui/events/x/events_x_unittest.cc ('k') | ui/gl/gl_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698