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

Unified Diff: ui/ozone/platform/drm/gpu/screen_manager.h

Issue 2603863002: Remove base::ScopedPtrHashMap from ozone. (Closed)
Patch Set: fixes Created 4 years 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/ozone/platform/drm/gpu/screen_manager.h
diff --git a/ui/ozone/platform/drm/gpu/screen_manager.h b/ui/ozone/platform/drm/gpu/screen_manager.h
index 3c799c68d455249184f0187d45684b6431e04787..7785b946f1c59eb184616c4222f931bf7c92fb46 100644
--- a/ui/ozone/platform/drm/gpu/screen_manager.h
+++ b/ui/ozone/platform/drm/gpu/screen_manager.h
@@ -7,7 +7,8 @@
#include <stdint.h>
-#include "base/containers/scoped_ptr_hash_map.h"
+#include <unordered_map>
+
#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
@@ -80,11 +81,10 @@ class ScreenManager {
void UpdateControllerToWindowMapping();
private:
- typedef std::vector<std::unique_ptr<HardwareDisplayController>>
- HardwareDisplayControllers;
- typedef base::ScopedPtrHashMap<gfx::AcceleratedWidget,
- std::unique_ptr<DrmWindow>>
- WidgetToWindowMap;
+ using HardwareDisplayControllers =
+ std::vector<std::unique_ptr<HardwareDisplayController>>;
+ using WidgetToWindowMap =
+ std::unordered_map<gfx::AcceleratedWidget, std::unique_ptr<DrmWindow>>;
// Returns an iterator into |controllers_| for the controller identified by
// (|crtc|, |connector|).
« no previous file with comments | « ui/ozone/platform/drm/gpu/hardware_display_controller.cc ('k') | ui/ozone/platform/drm/gpu/screen_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698