| Index: ui/ozone/platform/drm/host/drm_native_display_delegate.h
|
| diff --git a/ui/ozone/platform/drm/host/drm_native_display_delegate.h b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
|
| index b922e33c662d68be769fb2f6e444af89c8304a60..a6844ba81d3356aa742897449eeac45431755b4a 100644
|
| --- a/ui/ozone/platform/drm/host/drm_native_display_delegate.h
|
| +++ b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
|
| @@ -6,12 +6,11 @@
|
| #define UI_OZONE_PLATFORM_DRM_HOST_NATIVE_DISPLAY_DELEGATE_HOST_H_
|
|
|
| #include <map>
|
| -#include <set>
|
|
|
| +#include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/files/file.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/observer_list.h"
|
| #include "ui/display/types/native_display_delegate.h"
|
| @@ -23,6 +22,7 @@ namespace ui {
|
|
|
| class DeviceManager;
|
| class DisplayManager;
|
| +class DrmDeviceHandle;
|
| class DrmGpuPlatformSupportHost;
|
|
|
| struct DisplaySnapshot_Params;
|
| @@ -82,7 +82,7 @@ class DrmNativeDisplayDelegate : public NativeDisplayDelegate,
|
|
|
| // Called as a result of finishing to process the display hotplug event. These
|
| // are responsible for dequing the event and scheduling the next event.
|
| - void OnAddGraphicsDevice(const base::FilePath& path, base::File file);
|
| + void OnAddGraphicsDevice(const base::FilePath& path);
|
| void OnUpdateGraphicsDevice();
|
| void OnRemoveGraphicsDevice(const base::FilePath& path);
|
|
|
| @@ -110,7 +110,7 @@ class DrmNativeDisplayDelegate : public NativeDisplayDelegate,
|
| std::map<int64_t, ConfigureCallback> configure_callback_map_;
|
|
|
| // Keeps track of all the active DRM devices.
|
| - std::set<base::FilePath> drm_devices_;
|
| + base::ScopedPtrHashMap<base::FilePath, DrmDeviceHandle> drm_devices_;
|
|
|
| // Used to asynchronously process display hotplug events in the correct order.
|
| SequencedScheduler scheduler_;
|
|
|