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

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

Issue 1456703004: ScopedPtrMap -> std::map from /ui/gfx/image (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | ui/gfx/image/image.cc » ('j') | ui/gfx/image/image.cc » ('J')
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 59b7a6e25ef0eaa02328a2d8a478b7355b83a157..931fe2af6f24c7c004f73c1d4332777e925748a3 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -19,10 +19,10 @@
#ifndef UI_GFX_IMAGE_IMAGE_H_
#define UI_GFX_IMAGE_IMAGE_H_
+#include <map>
#include <vector>
#include "base/basictypes.h"
-#include "base/containers/scoped_ptr_map.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/scoped_ptr.h"
#include "ui/gfx/gfx_export.h"
@@ -53,8 +53,8 @@ class GFX_EXPORT Image {
kImageRepPNG,
};
- typedef base::ScopedPtrMap<RepresentationType, scoped_ptr<internal::ImageRep>>
- RepresentationMap;
+ using RepresentationMap =
+ std::map<RepresentationType, scoped_ptr<internal::ImageRep>>;
// Creates an empty image with no representations.
Image();
« no previous file with comments | « no previous file | ui/gfx/image/image.cc » ('j') | ui/gfx/image/image.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698