Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: ui/events/ozone/evdev/event_factory_evdev.h

Issue 1048333005: ozone: Map TouchEvent::touch_id_ into expected range (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Push all touch id management into EventFactoryEvdev Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_ 5 #ifndef UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_
6 #define UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_ 6 #define UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/task_runner.h" 12 #include "base/task_runner.h"
13 #include "ui/events/ozone/device/device_event_observer.h" 13 #include "ui/events/ozone/device/device_event_observer.h"
14 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h" 14 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
15 #include "ui/events/ozone/evdev/event_modifiers_evdev.h" 15 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
16 #include "ui/events/ozone/evdev/event_thread_evdev.h" 16 #include "ui/events/ozone/evdev/event_thread_evdev.h"
17 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 17 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
18 #include "ui/events/ozone/evdev/input_controller_evdev.h" 18 #include "ui/events/ozone/evdev/input_controller_evdev.h"
19 #include "ui/events/ozone/evdev/keyboard_evdev.h" 19 #include "ui/events/ozone/evdev/keyboard_evdev.h"
20 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h" 20 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
21 #include "ui/events/platform/platform_event_source.h" 21 #include "ui/events/platform/platform_event_source.h"
22 #include "ui/gfx/native_widget_types.h" 22 #include "ui/gfx/native_widget_types.h"
23 #include "ui/gfx/sequential_id_generator.h"
23 #include "ui/ozone/public/system_input_injector.h" 24 #include "ui/ozone/public/system_input_injector.h"
24 25
25 namespace gfx { 26 namespace gfx {
26 class PointF; 27 class PointF;
27 } // namespace gfx 28 } // namespace gfx
28 29
29 namespace ui { 30 namespace ui {
30 31
31 class CursorDelegateEvdev; 32 class CursorDelegateEvdev;
32 class DeviceManager; 33 class DeviceManager;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 122
122 // Object for controlling input devices. 123 // Object for controlling input devices.
123 InputControllerEvdev input_controller_; 124 InputControllerEvdev input_controller_;
124 125
125 // Whether we've set up the device factory. 126 // Whether we've set up the device factory.
126 bool initialized_; 127 bool initialized_;
127 128
128 // Thread for device I/O. 129 // Thread for device I/O.
129 EventThreadEvdev thread_; 130 EventThreadEvdev thread_;
130 131
132 // Touch event id generator.
133 SequentialIDGenerator touch_id_generator_;
134
131 // Support weak pointers for attach & detach callbacks. 135 // Support weak pointers for attach & detach callbacks.
132 base::WeakPtrFactory<EventFactoryEvdev> weak_ptr_factory_; 136 base::WeakPtrFactory<EventFactoryEvdev> weak_ptr_factory_;
133 137
134 DISALLOW_COPY_AND_ASSIGN(EventFactoryEvdev); 138 DISALLOW_COPY_AND_ASSIGN(EventFactoryEvdev);
135 }; 139 };
136 140
137 } // namespace ui 141 } // namespace ui
138 142
139 #endif // UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_ 143 #endif // UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/device_event_dispatcher_evdev.cc ('k') | ui/events/ozone/evdev/event_factory_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698