Chromium Code Reviews| Index: ui/android/resources/resource_manager_impl.h |
| diff --git a/ui/android/resources/resource_manager_impl.h b/ui/android/resources/resource_manager_impl.h |
| index 31d26f5f8f945b94305bb817d8ab30de1e1b5d4e..829895d550f71744b94f08165273988c96361579 100644 |
| --- a/ui/android/resources/resource_manager_impl.h |
| +++ b/ui/android/resources/resource_manager_impl.h |
| @@ -7,7 +7,6 @@ |
| #include <memory> |
| -#include "base/id_map.h" |
| #include "base/macros.h" |
| #include "ui/android/resources/resource_manager.h" |
| #include "ui/android/ui_android_export.h" |
| @@ -86,8 +85,8 @@ class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager { |
| int metadata_res_id, |
| bool reloading); |
| - typedef IDMap<Resource, IDMapOwnPointer> ResourceMap; |
| - typedef IDMap<CrushedSpriteResource, IDMapOwnPointer> |
| + typedef std::unordered_map<int, std::unique_ptr<Resource> > ResourceMap; |
|
David Trainor- moved to gerrit
2016/09/09 06:11:32
move to using?
mdjones
2016/09/09 16:47:23
Done.
|
| + typedef std::unordered_map<int, std::unique_ptr<CrushedSpriteResource> > |
| CrushedSpriteResourceMap; |
| typedef std::unordered_map<int, std::unique_ptr<ResourceMap> > |
| TintedResourceMap; |