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

ui/events/ozone/evdev/event_factory_evdev.h

Index: ui/events/ozone/evdev/event_factory_evdev.h
diff --git a/ui/events/ozone/evdev/event_factory_evdev.h b/ui/events/ozone/evdev/event_factory_evdev.h
index 2fed9848b2616c2ce9f33f8f928aaf8d76137b02..1d4eeabc4d3762e8b95add75d8a2975d75629dbb 100644
--- a/ui/events/ozone/evdev/event_factory_evdev.h
+++ b/ui/events/ozone/evdev/event_factory_evdev.h
@@ -38,10 +38,8 @@ enum class DomCode;
 #endif
 
 // Ozone events implementation for the Linux input subsystem ("evdev").
-class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev
-    : public DeviceEventObserver,
-      public PlatformEventSource,
-      public DeviceEventDispatcherEvdev {
+class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
+                                                    public PlatformEventSource {
  public:
   EventFactoryEvdev(CursorDelegateEvdev* cursor,
                     DeviceManager* device_manager,
@@ -58,28 +56,27 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev
 
   InputController* input_controller() { return &input_controller_; }
 
-  // DeviceEventDispatchEvdev:
-  void DispatchKeyEvent(int device_id, unsigned int code, bool down) override;
-  void DispatchMouseMoveEvent(int device_id,
-                              const gfx::PointF& location) override;
+  // User input events.
+  void DispatchKeyEvent(int device_id, unsigned int code, bool down);
+  void DispatchMouseMoveEvent(int device_id, const gfx::PointF& location);
   void DispatchMouseButtonEvent(int device_id,
                                 const gfx::PointF& location,
                                 unsigned int button,
                                 bool down,
-                                bool allow_remap) override;
+                                bool allow_remap);
   void DispatchMouseWheelEvent(int device_id,
                                const gfx::PointF& location,
-                               const gfx::Vector2d& delta) override;
-  void DispatchScrollEvent(const ScrollEventParams& params) override;
-  void DispatchTouchEvent(const TouchEventParams& params) override;
+                               const gfx::Vector2d& delta);
+  void DispatchScrollEvent(const ScrollEventParams& params);
+  void DispatchTouchEvent(const TouchEventParams& params);
+
+  // Device lifecycle events.
   void DispatchKeyboardDevicesUpdated(
-      const std::vector<KeyboardDevice>& devices) override;
+      const std::vector<KeyboardDevice>& devices);
   void DispatchTouchscreenDevicesUpdated(
-      const std::vector<TouchscreenDevice>& devices) override;
-  void DispatchMouseDevicesUpdated(
-      const std::vector<InputDevice>& devices) override;
-  void DispatchTouchpadDevicesUpdated(
-      const std::vector<InputDevice>& devices) override;
+      const std::vector<TouchscreenDevice>& devices);
+  void DispatchMouseDevicesUpdated(const std::vector<InputDevice>& devices);
+  void DispatchTouchpadDevicesUpdated(const std::vector<InputDevice>& devices);
 
  protected:
   // DeviceEventObserver overrides: