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

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

Issue 1096983002: Update usages of std::map to use ScopedPtrMap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@passwordmanager-scopedmemory
Patch Set: Fix Mac compile. Created 5 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.h
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index 87c80834f711191d515ba4927a8455f015268ee2..ee0fd9afdc37ebfb05333e9f4fd8108dbd9d2ff6 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/gtest_prod_util.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/scoped_ptr.h"
@@ -59,7 +59,8 @@ class GFX_EXPORT Image {
kImageRepPNG,
};
- typedef std::map<RepresentationType, internal::ImageRep*> RepresentationMap;
+ typedef ScopedPtrMap<RepresentationType, scoped_ptr<internal::ImageRep>>
Robert Sesek 2015/06/18 12:50:21 Optional: You could update this to a using Represe
Matt Giuca 2015/06/19 04:03:25 Thanks for the suggestion. I think I won't do this
+ RepresentationMap;
// Creates an empty image with no representations.
Image();

Powered by Google App Engine
This is Rietveld 408576698