| Index: ui/base/touch/touch_device.h
|
| diff --git a/ui/base/touch/touch_device.h b/ui/base/touch/touch_device.h
|
| index 191569f0e6d20b74554b72e655d45808dd1037a7..61c1654afe7688121e60d47831b9680962eeae98 100644
|
| --- a/ui/base/touch/touch_device.h
|
| +++ b/ui/base/touch/touch_device.h
|
| @@ -29,6 +29,8 @@ UI_BASE_EXPORT int MaxTouchPoints();
|
| // Bit field values indicating available pointer types. Identical to
|
| // blink::WebSettings::PointerType enums, enforced by compile-time assertions
|
| // in content/public/common/web_preferences.cc .
|
| +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.ui.base
|
| +// GENERATED_JAVA_PREFIX_TO_STRIP: POINTER_TYPE_
|
| enum PointerType {
|
| POINTER_TYPE_NONE = 1 << 0,
|
| POINTER_TYPE_FIRST = POINTER_TYPE_NONE,
|
| @@ -40,6 +42,8 @@ enum PointerType {
|
| // Bit field values indicating available hover types. Identical to
|
| // blink::WebSettings::HoverType enums, enforced by compile-time assertions
|
| // in content/public/common/web_preferences.cc .
|
| +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.ui.base
|
| +// GENERATED_JAVA_PREFIX_TO_STRIP: HOVER_TYPE_
|
| enum HoverType {
|
| HOVER_TYPE_NONE = 1 << 0,
|
| HOVER_TYPE_FIRST = HOVER_TYPE_NONE,
|
| @@ -48,6 +52,11 @@ enum HoverType {
|
| HOVER_TYPE_LAST = HOVER_TYPE_HOVER
|
| };
|
|
|
| +UI_BASE_EXPORT int AvailablePointerTypes();
|
| +UI_BASE_EXPORT PointerType PrimaryPointerType();
|
| +UI_BASE_EXPORT int AvailableHoverTypes();
|
| +UI_BASE_EXPORT HoverType PrimaryHoverType();
|
| +
|
| #if defined(OS_ANDROID)
|
| bool RegisterTouchDeviceAndroid(JNIEnv* env);
|
| #endif
|
|
|