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

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 again. Move id generation logic to EventFactoryEvdev 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 f097fb43673f03c575464a396bf2278c88d6a98e..97f14b1570dfacec4c57d73244d50051809ad1ae 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 @@ namespace ui {
class EventDeviceInfo;
class EventModifiersEvdev;
class CursorDelegateEvdev;
+class GestureDeviceProperties;
+class GesturePropertyProvider;
// Convert libevdev-cros events to ui::Events using libgestures.
//
@@ -37,8 +39,9 @@ class CursorDelegateEvdev;
class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
: public EventReaderLibevdevCros::Delegate {
public:
- GestureInterpreterLibevdevCros(EventModifiersEvdev* modifiers,
+ GestureInterpreterLibevdevCros(int id, EventModifiersEvdev* modifiers,
CursorDelegateEvdev* cursor,
+ GesturePropertyProvider* property_provider,
const EventDispatchCallback& callback);
virtual ~GestureInterpreterLibevdevCros();
@@ -52,6 +55,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);
@@ -68,18 +76,30 @@ class EVENTS_OZONE_EVDEV_EXPORT GestureInterpreterLibevdevCros
void Dispatch(Event* event);
void DispatchMouseButton(unsigned int modifier, bool down);
+ // The unique device id.
+ int id_;
+
// Shared modifier state.
EventModifiersEvdev* modifiers_;
// 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);
};

Powered by Google App Engine
This is Rietveld 408576698