[PATCH 9/11] ozone: evdev: Add a device event dispatcher that forwards to UI thread

ui/events/ozone/evdev/input_device_factory_evdev.h

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 be9295e6ba2774db2ecfb180727f0388879b4b0e..767b7fb7e720c9cd14e953a8964ad82e8a2db528 100644
--- a/ui/events/ozone/evdev/input_device_factory_evdev.h
+++ b/ui/events/ozone/evdev/input_device_factory_evdev.h
@@ -36,10 +36,8 @@ typedef base::Callback<void(scoped_ptr<std::string>)> GetTouchDeviceStatusReply;
 // 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.
@@ -95,8 +93,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_;
@@ -107,7 +105,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_;