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 cd67af66328185f767268c0404706636f00c101a..bc2134ddb963cdbe691b85f74ff6f01214dc4557 100644 |
| --- a/ui/events/ozone/evdev/event_factory_evdev.cc |
| +++ b/ui/events/ozone/evdev/event_factory_evdev.cc |
| @@ -134,13 +134,14 @@ EventFactoryEvdev::EventFactoryEvdev( |
| CursorDelegateEvdev* cursor, |
| DeviceManager* device_manager) |
| : device_manager_(device_manager), |
| - has_started_processing_events_(false), |
| ui_task_runner_(base::MessageLoopProxy::current()), |
|
spang
2014/05/16 15:01:17
I think you need to remove this initializer.
sadrul
2014/05/16 16:34:14
Done.
|
| cursor_(cursor), |
| dispatch_callback_( |
| base::Bind(base::IgnoreResult(&EventFactoryEvdev::DispatchUiEvent), |
| base::Unretained(this))), |
| - weak_ptr_factory_(this) {} |
| + weak_ptr_factory_(this) { |
| + CHECK(device_manager_); |
| +} |
| EventFactoryEvdev::~EventFactoryEvdev() { STLDeleteValues(&converters_); } |
| @@ -197,10 +198,12 @@ void EventFactoryEvdev::OnDeviceEvent(const DeviceEvent& event) { |
| } |
| void EventFactoryEvdev::OnDispatcherListChanged() { |
| - if (ui_task_runner_) |
| - return; |
| - ui_task_runner_ = base::MessageLoopProxy::current(); |
| - StartProcessingEvents(); |
| + if (!ui_task_runner_) { |
| + ui_task_runner_ = base::MessageLoopProxy::current(); |
| + // Scan & monitor devices. |
| + device_manager_->AddObserver(this); |
| + device_manager_->ScanDevices(this); |
| + } |
| } |
| void EventFactoryEvdev::DetachInputDevice(const base::FilePath& path) { |
| @@ -224,19 +227,6 @@ void EventFactoryEvdev::DetachInputDevice(const base::FilePath& path) { |
| } |
| } |
| -void EventFactoryEvdev::StartProcessingEvents() { |
| - if (!ui_task_runner_) |
| - return; |
| - 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_) { |