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

ui/events/ozone/evdev/input_device_factory_evdev.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 16 matching lines @@
 #error Missing dependency on ui/events/ozone:events_ozone_evdev
 #endif
 
 #if defined(USE_EVDEV_GESTURES)
 class GesturePropertyProvider;
 #endif
 
 // 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.
   void AddInputDevice(int id, const base::FilePath& path);
 
   // Stop reading & close an unplugged input device.
   void RemoveInputDevice(const base::FilePath& path);
 
   // Disables the internal touchpad.
   void DisableInternalTouchpad();
@@ skipping 34 matching lines @@
   void SetIntPropertyForOneType(const EventDeviceType type,
                                 const std::string& name,
                                 int value);
   void SetBoolPropertyForOneType(const EventDeviceType type,
                                  const std::string& name,
                                  bool value);
 
   // 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_;
 
 #if defined(USE_EVDEV_GESTURES)
   // Gesture library property provider (used by touchpads/mice).
   scoped_ptr<GesturePropertyProvider> gesture_property_provider_;
 #endif
 
   // Dispatcher for events.
-  DeviceEventDispatcherEvdev* dispatcher_;
+  scoped_ptr<DeviceEventDispatcherEvdev> dispatcher_;
 
   // Support weak pointers for attach & detach callbacks.
   base::WeakPtrFactory<InputDeviceFactoryEvdev> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InputDeviceFactoryEvdev);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_