diff options
Diffstat (limited to 'chromium/ui/base/pointer/pointer_device.h')
| -rw-r--r-- | chromium/ui/base/pointer/pointer_device.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/chromium/ui/base/pointer/pointer_device.h b/chromium/ui/base/pointer/pointer_device.h index 19765542fb3..c50fdde7fe7 100644 --- a/chromium/ui/base/pointer/pointer_device.h +++ b/chromium/ui/base/pointer/pointer_device.h @@ -7,8 +7,8 @@ #include <tuple> +#include "base/component_export.h" #include "build/build_config.h" -#include "ui/base/ui_base_export.h" #if defined(OS_ANDROID) #include <jni.h> @@ -22,7 +22,8 @@ enum class TouchScreensAvailability { DISABLED, // Touch screens are present and disabled. }; -UI_BASE_EXPORT TouchScreensAvailability GetTouchScreensAvailability(); +COMPONENT_EXPORT(UI_BASE) +TouchScreensAvailability GetTouchScreensAvailability(); // Returns the maximum number of simultaneous touch contacts supported // by the device. In the case of devices with multiple digitizers (e.g. @@ -31,7 +32,7 @@ UI_BASE_EXPORT TouchScreensAvailability GetTouchScreensAvailability(); // For example, suppose a device has 3 touchscreens, which support 2, 5, // and 10 simultaneous touch contacts, respectively. This returns 10. // http://www.w3.org/TR/pointerevents/#widl-Navigator-maxTouchPoints -UI_BASE_EXPORT int MaxTouchPoints(); +COMPONENT_EXPORT(UI_BASE) int MaxTouchPoints(); // Bit field values indicating available pointer types. Identical to // blink::PointerType enums, enforced by compile-time assertions in @@ -60,12 +61,15 @@ enum HoverType { int GetAvailablePointerTypes(); int GetAvailableHoverTypes(); -UI_BASE_EXPORT std::pair<int, int> GetAvailablePointerAndHoverTypes(); -UI_BASE_EXPORT void SetAvailablePointerAndHoverTypesForTesting( - int available_pointer_types, - int available_hover_types); -UI_BASE_EXPORT PointerType GetPrimaryPointerType(int available_pointer_types); -UI_BASE_EXPORT HoverType GetPrimaryHoverType(int available_hover_types); +COMPONENT_EXPORT(UI_BASE) +std::pair<int, int> GetAvailablePointerAndHoverTypes(); +COMPONENT_EXPORT(UI_BASE) +void SetAvailablePointerAndHoverTypesForTesting(int available_pointer_types, + int available_hover_types); +COMPONENT_EXPORT(UI_BASE) +PointerType GetPrimaryPointerType(int available_pointer_types); +COMPONENT_EXPORT(UI_BASE) +HoverType GetPrimaryHoverType(int available_hover_types); } // namespace ui |