| Index: ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h
|
| diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h
|
| index 1044a112251025c3440a6066554dfd678c49b021..2f560aeb9b393329ce32b8f4944cdd933b862e63 100644
|
| --- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h
|
| +++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h
|
| @@ -20,6 +20,8 @@ class Event;
|
| class EventDeviceInfo;
|
| class EventModifiersEvdev;
|
| class CursorDelegateEvdev;
|
| +class GestureDeviceProperties;
|
| +class GesturePropertyProvider;
|
|
|
| typedef base::Callback<void(Event*)> EventDispatchCallback;
|
|
|
| @@ -41,6 +43,7 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
|
| public:
|
| GestureInterpreterLibevdevCros(EventModifiersEvdev* modifiers,
|
| CursorDelegateEvdev* cursor,
|
| + GesturePropertyProvider* property_provider,
|
| const EventDispatchCallback& callback);
|
| virtual ~GestureInterpreterLibevdevCros();
|
|
|
| @@ -54,6 +57,12 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
|
| // Handler for gesture events generated from libgestures.
|
| void OnGestureReady(const Gesture* gesture);
|
|
|
| + // Return the GesturePropertyProvider object pointer.
|
| + GesturePropertyProvider* property_provider() { return property_provider_; }
|
| +
|
| + // Return the Evdev device pointer.
|
| + Evdev* evdev() { return evdev_; }
|
| +
|
| private:
|
| void OnGestureMove(const Gesture* gesture, const GestureMove* move);
|
| void OnGestureScroll(const Gesture* gesture, const GestureScroll* move);
|
| @@ -76,12 +85,21 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
|
| // Shared cursor state.
|
| CursorDelegateEvdev* cursor_;
|
|
|
| + // Shared gesture property provider.
|
| + GesturePropertyProvider* property_provider_;
|
| +
|
| // Callback for dispatching events.
|
| EventDispatchCallback dispatch_callback_;
|
|
|
| // Gestures interpretation state.
|
| gestures::GestureInterpreter* interpreter_;
|
|
|
| + // Device pointer.
|
| + Evdev* evdev_;
|
| +
|
| + // Gesture lib device properties.
|
| + scoped_ptr<GestureDeviceProperties> device_properties_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(GestureInterpreterLibevdevCros);
|
| };
|
|
|
|
|