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

ui/events/ozone/evdev/event_dispatch_callback.h

Index: ui/events/ozone/evdev/event_dispatch_callback.h
diff --git a/ui/events/ozone/evdev/event_dispatch_callback.h b/ui/events/ozone/evdev/event_dispatch_callback.h
index 77dd488068deb3f60ab98ce4c6b9d907f431437e..ae0781788766ad983bb92b130af5bf28a33b4a00 100644
--- a/ui/events/ozone/evdev/event_dispatch_callback.h
+++ b/ui/events/ozone/evdev/event_dispatch_callback.h
@@ -6,22 +6,6 @@
 #define UI_EVENTS_OZONE_EVDEV_EVENT_DISPATCH_CALLBACK_H_
 
 #include "base/callback.h"
-#include "base/time/time.h"
-#include "ui/events/event_constants.h"
-#include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
-#include "ui/gfx/geometry/point_f.h"
-#include "ui/gfx/geometry/vector2d.h"
-#include "ui/gfx/geometry/vector2d_f.h"
-
-namespace base {
-class TimeDelta;
-}
-
-namespace gfx {
-class PointF;
-class Vector2d;
-class Vector2dF;
-}
 
 namespace ui {
 
@@ -29,111 +13,6 @@ class Event;
 
 typedef base::Callback<void(scoped_ptr<Event>)> EventDispatchCallback;
 
-struct EVENTS_OZONE_EVDEV_EXPORT KeyEventParams {
-  KeyEventParams(int device_id, unsigned int code, bool down);
-  KeyEventParams(const KeyEventParams& other);
-  ~KeyEventParams();
-
-  int device_id;
-  unsigned int code;
-  bool down;
-};
-
-typedef base::Callback<void(const KeyEventParams& params)>
-    KeyEventDispatchCallback;
-
-struct EVENTS_OZONE_EVDEV_EXPORT MouseMoveEventParams {
-  MouseMoveEventParams(int device_id, const gfx::PointF& location);
-  MouseMoveEventParams(const MouseMoveEventParams& other);
-  ~MouseMoveEventParams();
-
-  int device_id;
-  gfx::PointF location;
-};
-
-typedef base::Callback<void(const MouseMoveEventParams& params)>
-    MouseMoveEventDispatchCallback;
-
-struct EVENTS_OZONE_EVDEV_EXPORT MouseButtonEventParams {
-  MouseButtonEventParams(int device_id,
-                         const gfx::PointF& location,
-                         unsigned int button,
-                         bool down,
-                         bool allow_remap);
-  MouseButtonEventParams(const MouseButtonEventParams& other);
-  ~MouseButtonEventParams();
-
-  int device_id;
-  gfx::PointF location;
-  unsigned int button;
-  bool down;
-  bool allow_remap;
-};
-
-typedef base::Callback<void(const MouseButtonEventParams& params)>
-    MouseButtonEventDispatchCallback;
-
-struct EVENTS_OZONE_EVDEV_EXPORT MouseWheelEventParams {
-  MouseWheelEventParams(int device_id,
-                        const gfx::PointF& location,
-                        const gfx::Vector2d& delta);
-  MouseWheelEventParams(const MouseWheelEventParams& other);
-  ~MouseWheelEventParams();
-
-  int device_id;
-  gfx::PointF location;
-  gfx::Vector2d delta;
-};
-
-typedef base::Callback<void(const MouseWheelEventParams& params)>
-    MouseWheelEventDispatchCallback;
-
-struct EVENTS_OZONE_EVDEV_EXPORT ScrollEventParams {
-  ScrollEventParams(int device_id,
-                    EventType type,
-                    const gfx::PointF location,
-                    const gfx::Vector2dF delta,
-                    const gfx::Vector2dF ordinal_delta,
-                    int finger_count,
-                    const base::TimeDelta timestamp);
-  ScrollEventParams(const ScrollEventParams& other);
-  ~ScrollEventParams();
-
-  int device_id;
-  EventType type;
-  const gfx::PointF location;
-  const gfx::Vector2dF delta;
-  const gfx::Vector2dF ordinal_delta;
-  int finger_count;
-  const base::TimeDelta timestamp;
-};
-
-typedef base::Callback<void(const ScrollEventParams& params)>
-    ScrollEventDispatchCallback;
-
-struct EVENTS_OZONE_EVDEV_EXPORT TouchEventParams {
-  TouchEventParams(int device_id,
-                   int touch_id,
-                   EventType type,
-                   const gfx::PointF& location,
-                   const gfx::Vector2dF& radii,
-                   float pressure,
-                   const base::TimeDelta& timestamp);
-  TouchEventParams(const TouchEventParams& other);
-  ~TouchEventParams();
-
-  int device_id;
-  int touch_id;
-  EventType type;
-  gfx::PointF location;
-  gfx::Vector2dF radii;
-  float pressure;
-  base::TimeDelta timestamp;
-};
-
-typedef base::Callback<void(const TouchEventParams& params)>
-    TouchEventDispatchCallback;
-
 }  // namspace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_DISPATCH_CALLBACK_H_