Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Unified Diff: ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h

Issue 545063006: ozone: evdev: Add gesture property provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase code again. Fix #ifdef. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a0863bf08bea0d46ede63b8291d47232ab11d520..0499c5795d5956574e7c71ce6f6a7cef4dcb99a0 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
@@ -22,6 +22,8 @@ class EventDeviceInfo;
class EventModifiersEvdev;
class CursorDelegateEvdev;
class KeyboardEvdev;
+class GestureDeviceProperties;
+class GesturePropertyProvider;
// Convert libevdev-cros events to ui::Events using libgestures.
//
@@ -39,9 +41,11 @@ class KeyboardEvdev;
class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
: public EventReaderLibevdevCros::Delegate {
public:
- GestureInterpreterLibevdevCros(EventModifiersEvdev* modifiers,
+ GestureInterpreterLibevdevCros(int id,
+ EventModifiersEvdev* modifiers,
CursorDelegateEvdev* cursor,
KeyboardEvdev* keyboard,
+ GesturePropertyProvider* property_provider,
const EventDispatchCallback& callback);
virtual ~GestureInterpreterLibevdevCros();
@@ -55,6 +59,11 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
// Handler for gesture events generated from libgestures.
void OnGestureReady(const Gesture* gesture);
+ // Accessors.
+ int id() { return id_; }
+ GesturePropertyProvider* property_provider() { return property_provider_; }
+ Evdev* evdev() { return evdev_; }
+
private:
void OnGestureMove(const Gesture* gesture, const GestureMove* move);
void OnGestureScroll(const Gesture* gesture, const GestureScroll* move);
@@ -72,6 +81,9 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
void DispatchMouseButton(unsigned int modifier, bool down);
void DispatchChangedKeys(Evdev* evdev, const timeval& time);
+ // The unique device id.
+ int id_;
+
// Shared modifier state.
EventModifiersEvdev* modifiers_;
@@ -81,6 +93,9 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
// Shared keyboard state.
KeyboardEvdev* keyboard_;
+ // Shared gesture property provider.
+ GesturePropertyProvider* property_provider_;
+
// Callback for dispatching events.
EventDispatchCallback dispatch_callback_;
@@ -90,6 +105,12 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
// Last key state from libevdev.
unsigned long prev_key_state_[EVDEV_BITS_TO_LONGS(KEY_CNT)];
+ // Device pointer.
+ Evdev* evdev_;
+
+ // Gesture lib device properties.
+ scoped_ptr<GestureDeviceProperties> device_properties_;
+
DISALLOW_COPY_AND_ASSIGN(GestureInterpreterLibevdevCros);
};

Powered by Google App Engine
This is Rietveld 408576698