| 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 71b752b637a7880d2cdc5ee1ecbf8b5adae069a0..c8e29f54600a34a84ad48bdeefedf092b475fbc5 100644
|
| --- a/ui/events/devices/x11/device_data_manager_x11.h
|
| +++ b/ui/events/devices/x11/device_data_manager_x11.h
|
| @@ -125,6 +125,9 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
|
| // no slot can be found.
|
| bool GetSlotNumber(const XIDeviceEvent* xiev, int* slot);
|
|
|
| + // Check if an XI event contains data of the specified type.
|
| + bool HasEventData(const XIDeviceEvent* xiev, const DataType type) const;
|
| +
|
| // Get all event data in one pass. We extract only data types that we know
|
| // about (defined in enum DataType). The data is not processed (e.g. not
|
| // filled in by cached values) as in GetEventData.
|
| @@ -220,7 +223,8 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
|
| // the actual device info, but rather inits the relevant valuator structures
|
| // to have safe default values for testing.
|
| void SetDeviceListForTest(const std::vector<int>& touchscreen,
|
| - const std::vector<int>& cmt_devices);
|
| + const std::vector<int>& cmt_devices,
|
| + const std::vector<int>& other_devices);
|
|
|
| void SetValuatorDataForTest(XIDeviceEvent* xievent,
|
| DataType type,
|
| @@ -255,9 +259,6 @@ class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
|
| // Initialize the XInput related system information.
|
| bool InitializeXInputInternal();
|
|
|
| - // Check if an XI event contains data of the specified type.
|
| - bool HasEventData(const XIDeviceEvent* xiev, const DataType type) const;
|
| -
|
| void InitializeValuatorsForTest(int deviceid,
|
| int start_valuator,
|
| int end_valuator,
|
|
|