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. |