OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/events/ozone/evdev/event_factory_evdev.h" | 5 #include "ui/events/ozone/evdev/event_factory_evdev.h" |
6 | 6 |
7 #include <fcntl.h> | 7 #include <fcntl.h> |
8 #include <linux/input.h> | 8 #include <linux/input.h> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "base/task_runner.h" | 12 #include "base/task_runner.h" |
13 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
14 #include "base/threading/worker_pool.h" | 14 #include "base/threading/worker_pool.h" |
15 #include "ui/events/device_data_manager.h" | 15 #include "ui/events/devices/device_data_manager.h" |
16 #include "ui/events/devices/device_util_linux.h" | |
msw
2014/11/03 21:05:10
Is this actually needed? I don't see a call to IsT
dnicoara
2014/11/03 21:13:01
Removed.
Thanks, missed it during the rebase.
| |
16 #include "ui/events/ozone/device/device_event.h" | 17 #include "ui/events/ozone/device/device_event.h" |
17 #include "ui/events/ozone/device/device_manager.h" | 18 #include "ui/events/ozone/device/device_manager.h" |
18 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" | 19 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" |
19 #include "ui/events/ozone/evdev/event_converter_evdev_impl.h" | 20 #include "ui/events/ozone/evdev/event_converter_evdev_impl.h" |
20 #include "ui/events/ozone/evdev/event_device_info.h" | 21 #include "ui/events/ozone/evdev/event_device_info.h" |
21 #include "ui/events/ozone/evdev/touch_event_converter_evdev.h" | 22 #include "ui/events/ozone/evdev/touch_event_converter_evdev.h" |
22 | 23 |
23 #if defined(USE_EVDEV_GESTURES) | 24 #if defined(USE_EVDEV_GESTURES) |
24 #include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h" | 25 #include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h" |
25 #include "ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cr os.h" | 26 #include "ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cr os.h" |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
314 } | 315 } |
315 | 316 |
316 observer->OnTouchscreenDevicesUpdated(touchscreens); | 317 observer->OnTouchscreenDevicesUpdated(touchscreens); |
317 } | 318 } |
318 | 319 |
319 int EventFactoryEvdev::NextDeviceId() { | 320 int EventFactoryEvdev::NextDeviceId() { |
320 return ++last_device_id_; | 321 return ++last_device_id_; |
321 } | 322 } |
322 | 323 |
323 } // namespace ui | 324 } // namespace ui |
OLD | NEW |