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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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/gfx/icon_util_unittest.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image.h
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index fa7ed1f2695baac29e55a5aaa54535e1749563d9..bf0d9b455fcd6d00c623b41b5d9875dee867ef5d 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -22,10 +22,10 @@
#include <stddef.h>
#include <map>
+#include <memory>
#include <vector>
#include "base/memory/ref_counted_memory.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "ui/gfx/gfx_export.h"
#include "ui/gfx/native_widget_types.h"
@@ -56,7 +56,7 @@ class GFX_EXPORT Image {
};
using RepresentationMap =
- std::map<RepresentationType, scoped_ptr<internal::ImageRep>>;
+ std::map<RepresentationType, std::unique_ptr<internal::ImageRep>>;
// Creates an empty image with no representations.
Image();
@@ -187,7 +187,7 @@ class GFX_EXPORT Image {
// not already be in the map. Returns a pointer to the representation stored
// inside the map.
internal::ImageRep* AddRepresentation(
- scoped_ptr<internal::ImageRep> rep) const;
+ std::unique_ptr<internal::ImageRep> rep) const;
// Internal class that holds all the representations. This allows the Image to
// be cheaply copied.
« no previous file with comments | « ui/gfx/icon_util_unittest.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698