| Index: ui/events/ozone/evdev/event_factory_evdev.h
|
| diff --git a/ui/events/ozone/evdev/event_factory_evdev.h b/ui/events/ozone/evdev/event_factory_evdev.h
|
| index e11647c1b70f7c3fd186086813c380d9dc77c062..1c8a7355c12ec1004ba49688cc41268c02d4fd70 100644
|
| --- a/ui/events/ozone/evdev/event_factory_evdev.h
|
| +++ b/ui/events/ozone/evdev/event_factory_evdev.h
|
| @@ -13,6 +13,7 @@
|
| #include "ui/events/ozone/device/device_event_observer.h"
|
| #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
|
| #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
|
| +#include "ui/events/ozone/evdev/event_thread_evdev.h"
|
| #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
|
| #include "ui/events/ozone/evdev/input_controller_evdev.h"
|
| #include "ui/events/ozone/evdev/keyboard_evdev.h"
|
| @@ -88,6 +89,11 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
|
|
|
| int NextDeviceId();
|
|
|
| + // Device thread initialization.
|
| + void StartThread();
|
| + void OnThreadStarted(
|
| + scoped_ptr<InputDeviceFactoryProxyEvdev> input_device_factory);
|
| +
|
| // Used to uniquely identify input devices.
|
| int last_device_id_;
|
|
|
| @@ -95,7 +101,6 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
|
| DeviceManager* device_manager_; // Not owned.
|
|
|
| // Factory for per-device objects.
|
| - scoped_ptr<InputDeviceFactoryEvdev> input_device_factory_;
|
| scoped_ptr<InputDeviceFactoryProxyEvdev> input_device_factory_proxy_;
|
|
|
| // Modifier key state (shift, ctrl, etc).
|
| @@ -113,9 +118,12 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
|
| // Object for controlling input devices.
|
| InputControllerEvdev input_controller_;
|
|
|
| - // Whether we've set up the device factory & done initial scan.
|
| + // Whether we've set up the device factory.
|
| bool initialized_;
|
|
|
| + // Thread for device I/O.
|
| + EventThreadEvdev thread_;
|
| +
|
| // Support weak pointers for attach & detach callbacks.
|
| base::WeakPtrFactory<EventFactoryEvdev> weak_ptr_factory_;
|
|
|
|
|