| Index: ui/events/ozone/evdev/input_device_factory_evdev_proxy.h
|
| diff --git a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h
|
| index 7c084ccc301bdd1c9aef30386b73ec8f283604d8..1b736eaae21a71209a3649c60c9e0009e53963a6 100644
|
| --- a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h
|
| +++ b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_
|
| #define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <vector>
|
|
|
| @@ -12,7 +13,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
|
| @@ -23,8 +23,9 @@ enum class DomCode;
|
| class InputDeviceFactoryEvdev;
|
| struct InputDeviceSettingsEvdev;
|
|
|
| -typedef base::Callback<void(scoped_ptr<std::string>)> GetTouchDeviceStatusReply;
|
| -typedef base::Callback<void(scoped_ptr<std::vector<base::FilePath>>)>
|
| +typedef base::Callback<void(std::unique_ptr<std::string>)>
|
| + GetTouchDeviceStatusReply;
|
| +typedef base::Callback<void(std::unique_ptr<std::vector<base::FilePath>>)>
|
| GetTouchEventLogReply;
|
|
|
| // Thread safe proxy for InputDeviceFactoryEvdev.
|
|
|