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

Unified Diff: ui/events/ozone/evdev/input_device_factory_evdev.h

Issue 874723002: [PATCH 9/11] ozone: evdev: Add a device event dispatcher that forwards to UI thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates for events_unittests Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: ui/events/ozone/evdev/input_device_factory_evdev.h
diff --git a/ui/events/ozone/evdev/input_device_factory_evdev.h b/ui/events/ozone/evdev/input_device_factory_evdev.h
index bd53c611eb209dc63a8a0e7baa3c92b5edf424ec..9ce9157d963bbcab13637d451ad39dc5960877cb 100644
--- a/ui/events/ozone/evdev/input_device_factory_evdev.h
+++ b/ui/events/ozone/evdev/input_device_factory_evdev.h
@@ -34,10 +34,8 @@ class GesturePropertyProvider;
// Manager for event device objects. All device I/O starts here.
class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdev {
public:
- InputDeviceFactoryEvdev(
- DeviceEventDispatcherEvdev* dispatcher,
- scoped_refptr<base::SingleThreadTaskRunner> dispatch_runner,
- CursorDelegateEvdev* cursor);
+ InputDeviceFactoryEvdev(scoped_ptr<DeviceEventDispatcherEvdev> dispatcher,
+ CursorDelegateEvdev* cursor);
~InputDeviceFactoryEvdev();
// Open & start reading a newly plugged-in input device.
@@ -92,8 +90,8 @@ class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdev {
// Owned per-device event converters (by path).
std::map<base::FilePath, EventConverterEvdev*> converters_;
- // Task runner for event dispatch.
- scoped_refptr<base::TaskRunner> ui_task_runner_;
+ // Task runner for our thread.
+ scoped_refptr<base::TaskRunner> task_runner_;
// Cursor movement.
CursorDelegateEvdev* cursor_;
@@ -104,7 +102,7 @@ class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdev {
#endif
// Dispatcher for events.
- DeviceEventDispatcherEvdev* dispatcher_;
+ scoped_ptr<DeviceEventDispatcherEvdev> dispatcher_;
// Support weak pointers for attach & detach callbacks.
base::WeakPtrFactory<InputDeviceFactoryEvdev> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698