[PATCH 5/11] ozone: evdev: Replace dispatch callbacks with an interface

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 <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "ui/events/ozone/device/device_event_observer.h"
+#include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/events/ozone/evdev/input_controller_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/ozone/public/system_input_injector.h"
@@ skipping 11 matching lines @@
 
 #if !defined(USE_EVDEV)
 #error Missing dependency on ui/events/ozone:events_ozone_evdev
 #endif
 
 #if defined(USE_EVDEV_GESTURES)
 class GesturePropertyProvider;
 #endif
 
 // Ozone events implementation for the Linux input subsystem ("evdev").
-class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
-                                                    public PlatformEventSource {
+class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev
+    : public DeviceEventObserver,
+      public PlatformEventSource,
+      public DeviceEventDispatcherEvdev {
  public:
   EventFactoryEvdev(CursorDelegateEvdev* cursor,
                     DeviceManager* device_manager,
                     KeyboardLayoutEngine* keyboard_layout_engine);
   ~EventFactoryEvdev() override;
 
+  // Initialize. Must be called with a valid message loop.
+  void Init();
+
   // Get a list of device ids that matches a device type. Return true if the
   // list is not empty. |device_ids| can be NULL.
   bool GetDeviceIdsByType(const EventDeviceType type,
                           std::vector<int>* device_ids);
 
   void WarpCursorTo(gfx::AcceleratedWidget widget,
                     const gfx::PointF& location);
 
   // Disables the internal touchpad.
   void DisableInternalTouchpad();
 
   // Enables the internal touchpad.
   void EnableInternalTouchpad();
 
   // Disables all keys on the internal keyboard except |excepted_keys|.
   void DisableInternalKeyboardExceptKeys(
       scoped_ptr<std::set<DomCode>> excepted_keys);
 
   // Enables all keys on the internal keyboard.
   void EnableInternalKeyboard();
 
   scoped_ptr<SystemInputInjector> CreateSystemInputInjector();
 
   InputController* input_controller() { return &input_controller_; }
 
-  // Post events to UI.
-  void PostKeyEvent(int device_id, unsigned int code, bool down);
-  void PostMouseMoveEvent(int device_id, const gfx::PointF& location);
-  void PostMouseButtonEvent(int device_id,
-                            const gfx::PointF& location,
-                            unsigned int button,
-                            bool down,
-                            bool allow_remap);
-  void PostMouseWheelEvent(int device_id,
-                           const gfx::PointF& location,
-                           const gfx::Vector2d& delta);
-  void PostScrollEvent(const ScrollEventParams& params);
-  void PostTouchEvent(const TouchEventParams& params);
+  // DeviceEventDispatchEvdev:
+  void DispatchKeyEvent(int device_id, unsigned int code, bool down) override;
+  void DispatchMouseMoveEvent(int device_id,
+                              const gfx::PointF& location) override;
+  void DispatchMouseButtonEvent(int device_id,
+                                const gfx::PointF& location,
+                                unsigned int button,
+                                bool down,
+                                bool allow_remap) override;
+  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;
 
  protected:
   // DeviceEventObserver overrides:
   //
   // Callback for device add (on UI thread).
   void OnDeviceEvent(const DeviceEvent& event) override;
 
   // PlatformEventSource:
   void OnDispatcherListChanged() override;
 
@@ skipping 45 matching lines @@
   CursorDelegateEvdev* cursor_;
 
 #if defined(USE_EVDEV_GESTURES)
   // Gesture library property provider (used by touchpads/mice).
   scoped_ptr<GesturePropertyProvider> gesture_property_provider_;
 #endif
 
   // Object for controlling input devices.
   InputControllerEvdev input_controller_;
 
+  // Whether we've set up the device factory & done initial scan.
+  bool initialized_;
+
   // 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_