| Index: ui/events/devices/x11/device_list_cache_x11.h
|
| diff --git a/ui/events/devices/x11/device_list_cache_x11.h b/ui/events/devices/x11/device_list_cache_x11.h
|
| index e0b6050fe4b1dabeb333fe23177522d69b6bf143..2ff3943a3802eb5108c6e74f7c182145df18eb81 100644
|
| --- a/ui/events/devices/x11/device_list_cache_x11.h
|
| +++ b/ui/events/devices/x11/device_list_cache_x11.h
|
| @@ -9,9 +9,9 @@
|
| #include <X11/extensions/XInput2.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/events/devices/events_devices_export.h"
|
| #include "ui/gfx/x/x11_types.h"
|
|
|
| @@ -26,7 +26,7 @@ struct DeviceList {
|
| DeviceList() : count(0) {}
|
| T& operator[](int x) { return devices[x]; }
|
| const T& operator[](int x) const { return devices[x]; }
|
| - scoped_ptr<T[], gfx::XObjectDeleter<T, void, D>> devices;
|
| + std::unique_ptr<T[], gfx::XObjectDeleter<T, void, D>> devices;
|
| int count;
|
| };
|
|
|
|
|