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