Chromium Code Reviews| 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..4322562a2315926afcf3713320c5755181d89a46 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* prop_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* GetPropertyProvider() { return prop_provider_; } |
|
alexst (slow to review)
2014/10/03 22:32:02
Per google code style http://google-styleguide.goo
Shecky Lin
2014/10/08 10:51:00
Done.
|
| + |
| + // Return the Evdev device pointer. |
| + Evdev* GetDevicePointer() { return dev_; } |
|
alexst (slow to review)
2014/10/03 22:32:02
Evdev* evdev() { return dev_; }
Shecky Lin
2014/10/08 10:50:59
Done.
|
| + |
| 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* prop_provider_; |
|
alexst (slow to review)
2014/10/03 22:32:02
Use full names please, property_provider_
Shecky Lin
2014/10/08 10:50:59
Done.
|
| + |
| // Callback for dispatching events. |
| EventDispatchCallback dispatch_callback_; |
| // Gestures interpretation state. |
| gestures::GestureInterpreter* interpreter_; |
| + // Device pointer. |
| + Evdev* dev_; |
|
alexst (slow to review)
2014/10/03 22:32:02
Full name here as well, evdev_
Shecky Lin
2014/10/08 10:50:59
Done.
|
| + |
| + // Gesture lib device properties. |
| + scoped_ptr<GestureDeviceProperties> device_props_; |
|
alexst (slow to review)
2014/10/03 22:32:02
device_properties_
Shecky Lin
2014/10/08 10:50:59
Done.
|
| + |
| DISALLOW_COPY_AND_ASSIGN(GestureInterpreterLibevdevCros); |
| }; |