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

ui/events/ozone/evdev/event_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_EVENT_FACTORY_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 20 matching lines @@
 class DeviceManager;
 class InputDeviceFactoryEvdev;
 class SystemInputInjector;
 enum class DomCode;
 
 #if !defined(USE_EVDEV)
 #error Missing dependency on ui/events/ozone:events_ozone_evdev
 #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,
                     KeyboardLayoutEngine* keyboard_layout_engine);
   ~EventFactoryEvdev() override;
 
   // Initialize. Must be called with a valid message loop.
   void Init();
 
   void WarpCursorTo(gfx::AcceleratedWidget widget,
                     const gfx::PointF& location);
 
   scoped_ptr<SystemInputInjector> CreateSystemInputInjector();
 
   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:
   //
   // Callback for device add (on UI thread).
   void OnDeviceEvent(const DeviceEvent& event) override;
 
   // PlatformEventSource:
   void OnDispatcherListChanged() override;
 
@@ skipping 38 matching lines @@
 
   // Support weak pointers for attach & detach callbacks.
   base::WeakPtrFactory<EventFactoryEvdev> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EventFactoryEvdev);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_