Ozone X11 platform

ui/events/devices/x11/device_data_manager_x11.h

Index: ui/events/devices/x11/device_data_manager_x11.h
diff --git a/ui/events/devices/x11/device_data_manager_x11.h b/ui/events/devices/x11/device_data_manager_x11.h
index ec580cbd4ddc77fbc51c22771f63e3e9a7fb175f..263fda099c8d844d55ead166446dbad83f58d580 100644
--- a/ui/events/devices/x11/device_data_manager_x11.h
+++ b/ui/events/devices/x11/device_data_manager_x11.h
@@ -139,32 +139,32 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
   // Check if the event is an XI input event in the strict sense
   // (i.e. XIDeviceEvent). This rules out things like hierarchy changes,
   /// device changes, property changes and so on.
-  bool IsXIDeviceEvent(const base::NativeEvent& native_event) const;
+  bool IsXIDeviceEvent(const XEvent* native_event) const;
 
   // Check if the event comes from touchpad devices.
-  bool IsTouchpadXInputEvent(const base::NativeEvent& native_event) const;
+  bool IsTouchpadXInputEvent(const XEvent* native_event) const;
 
   // Check if the event comes from devices running CMT driver or using
   // CMT valuators (e.g. mouses). Note that doesn't necessarily mean the event
   // is a CMT event (e.g. it could be a mouse pointer move).
-  bool IsCMTDeviceEvent(const base::NativeEvent& native_event) const;
+  bool IsCMTDeviceEvent(const XEvent* native_event) const;
 
   // Check if the event is one of the CMT gesture events (scroll, fling,
   // metrics etc.).
-  bool IsCMTGestureEvent(const base::NativeEvent& native_event) const;
+  bool IsCMTGestureEvent(const XEvent* native_event) const;
 
   // Returns true if the event is of the specific type, false if not.
-  bool IsScrollEvent(const base::NativeEvent& native_event) const;
-  bool IsFlingEvent(const base::NativeEvent& native_event) const;
-  bool IsCMTMetricsEvent(const base::NativeEvent& native_event) const;
+  bool IsScrollEvent(const XEvent* native_event) const;
+  bool IsFlingEvent(const XEvent* native_event) const;
+  bool IsCMTMetricsEvent(const XEvent* native_event) const;
 
   // Returns true if the event has CMT start/end timestamps.
-  bool HasGestureTimes(const base::NativeEvent& native_event) const;
+  bool HasGestureTimes(const XEvent* native_event) const;
 
   // Extract data from a scroll event (a motion event with the necessary
   // valuators). User must first verify the event type with IsScrollEvent.
   // Pointers shouldn't be NULL.
-  void GetScrollOffsets(const base::NativeEvent& native_event,
+  void GetScrollOffsets(const XEvent* native_event,
                         float* x_offset,
                         float* y_offset,
                         float* x_offset_ordinal,
@@ -173,7 +173,7 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
 
   // Extract data from a fling event. User must first verify the event type
   // with IsFlingEvent. Pointers shouldn't be NULL.
-  void GetFlingData(const base::NativeEvent& native_event,
+  void GetFlingData(const XEvent* native_event,
                     float* vx,
                     float* vy,
                     float* vx_ordinal,
@@ -182,7 +182,7 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
 
   // Extract data from a CrOS metrics gesture event. User must first verify
   // the event type with IsCMTMetricsEvent. Pointers shouldn't be NULL.
-  void GetMetricsData(const base::NativeEvent& native_event,
+  void GetMetricsData(const XEvent* native_event,
                       GestureMetricsType* type,
                       float* data1,
                       float* data2);
@@ -196,7 +196,7 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
 
   // Extract the start/end timestamps from CMT events. User must first verify
   // the event with HasGestureTimes. Pointers shouldn't be NULL.
-  void GetGestureTimes(const base::NativeEvent& native_event,
+  void GetGestureTimes(const XEvent* native_event,
                        double* start_time,
                        double* end_time);
 
@@ -237,7 +237,7 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
   void EnableDevice(unsigned int deviceid);
 
   // Returns true if |native_event| should be blocked.
-  bool IsEventBlocked(const base::NativeEvent& native_event);
+  bool IsEventBlocked(const XEvent* native_event);
 
  protected:
   // DeviceHotplugEventObserver: