Chromium Code Reviews| Index: ui/events/ozone/evdev/event_factory_evdev.cc |
| diff --git a/ui/events/ozone/evdev/event_factory_evdev.cc b/ui/events/ozone/evdev/event_factory_evdev.cc |
| index b1c5c4c381d947b959042348253d0a65dc28dcd0..842df47605e6957918aa6793fa06f68bead896de 100644 |
| --- a/ui/events/ozone/evdev/event_factory_evdev.cc |
| +++ b/ui/events/ozone/evdev/event_factory_evdev.cc |
| @@ -132,7 +132,6 @@ void CloseInputDevice(const base::FilePath& path, |
| EventFactoryEvdev::EventFactoryEvdev() |
| : device_manager_(NULL), |
| - has_started_processing_events_(false), |
| ui_task_runner_(base::MessageLoopProxy::current()), |
| cursor_(NULL), |
| dispatch_callback_( |
| @@ -144,13 +143,18 @@ EventFactoryEvdev::EventFactoryEvdev( |
| CursorDelegateEvdev* cursor, |
| DeviceManager* device_manager) |
| : device_manager_(device_manager), |
| - has_started_processing_events_(false), |
| ui_task_runner_(base::MessageLoopProxy::current()), |
| cursor_(cursor), |
| dispatch_callback_( |
| base::Bind(base::IgnoreResult(&EventFactoryEvdev::DispatchUiEvent), |
| base::Unretained(this))), |
| - weak_ptr_factory_(this) {} |
| + weak_ptr_factory_(this) { |
| + if (device_manager_) { |
| + // Scan & monitor devices. |
| + device_manager_->AddObserver(this); |
| + device_manager_->ScanDevices(this); |
|
sadrul
2014/05/15 16:30:04
I am not sure if this depends on other parts of th
|
| + } |
| +} |
| EventFactoryEvdev::~EventFactoryEvdev() { STLDeleteValues(&converters_); } |
| @@ -227,17 +231,6 @@ void EventFactoryEvdev::DetachInputDevice(const base::FilePath& path) { |
| } |
| } |
| -void EventFactoryEvdev::StartProcessingEvents() { |
| - CHECK(ui_task_runner_->RunsTasksOnCurrentThread()); |
| - |
| - if (device_manager_ && !has_started_processing_events_) { |
| - has_started_processing_events_ = true; |
| - // Scan & monitor devices. |
| - device_manager_->AddObserver(this); |
| - device_manager_->ScanDevices(this); |
| - } |
| -} |
| - |
| void EventFactoryEvdev::WarpCursorTo(gfx::AcceleratedWidget widget, |
| const gfx::PointF& location) { |
| if (cursor_) { |