[PATCH 4/11] ozone: evdev: Move EventModifiersEvdev usage to EventFactoryEvdev

ui/events/ozone/evdev/event_dispatch_callback.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_DISPATCH_CALLBACK_H_
 #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 {
 
 class Event;
 
 typedef base::Callback<void(scoped_ptr<Event>)> EventDispatchCallback;
 
 struct EVENTS_OZONE_EVDEV_EXPORT KeyEventParams {
@@ skipping 33 matching lines @@
   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_