| Index: ui/events/x/device_data_manager.h
|
| diff --git a/ui/events/x/device_data_manager.h b/ui/events/x/device_data_manager.h
|
| index 399bef9bf2c85ed468193c500109216073487b0c..7e20122c15fb168b873162a7d05e950dd894ea21 100644
|
| --- a/ui/events/x/device_data_manager.h
|
| +++ b/ui/events/x/device_data_manager.h
|
| @@ -14,7 +14,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/event_types.h"
|
| #include "ui/events/event_constants.h"
|
| -#include "ui/events/events_export.h"
|
| +#include "ui/events/events_base_export.h"
|
| #include "ui/gfx/x/x11_atom_cache.h"
|
|
|
| template <typename T> struct DefaultSingletonTraits;
|
| @@ -31,7 +31,7 @@ enum GestureMetricsType {
|
|
|
| // A class that extracts and tracks the input events data. It currently handles
|
| // mouse, touchpad and touchscreen devices.
|
| -class EVENTS_EXPORT DeviceDataManager {
|
| +class EVENTS_BASE_EXPORT DeviceDataManager {
|
| public:
|
| // Enumerate additional data that one might be interested on an input event,
|
| // which are usually wrapped in X valuators. If you modify any of this,
|
| @@ -103,6 +103,9 @@ class EVENTS_EXPORT DeviceDataManager {
|
| natural_scroll_enabled_ = enabled;
|
| }
|
|
|
| + // Returns if XInput2 is available on the system.
|
| + bool IsXInput2Available() const;
|
| +
|
| // Get the natural scroll direction multiplier (1.0f or -1.0f).
|
| float GetNaturalScrollFactor(int sourceid) const;
|
|
|
|
|