Pointer/hover media query support: platform-dependent changes

ui/base/touch/touch_device.h

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..589bbd20f069bb0db2509c18ca8fede911ef165a 100644
--- a/ui/base/touch/touch_device.h
+++ b/ui/base/touch/touch_device.h
@@ -11,6 +11,8 @@
 #include <jni.h>
 #endif
 
+// FIXME: This covers more than just touches. Rename to input_device? Should do
+// the same for most of the files in this folder.

[sadrul, 2014/12/03 21:45:02]

Can you please file a bug and reference it from here?

[mustaq, 2014/12/04 14:57:52]

Done.

 
 namespace ui {
 
@@ -29,6 +31,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 +44,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 +54,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();

[sadrul, 2014/12/03 21:45:02]

Can all these have Get prefix?

Document that these return _NONE if there's no real implementation.

[mustaq, 2014/12/04 14:57:51]

Done with the Get prefix.

I will skip adding comments that reflect my stub implementation details, for two
reasons: (i) I'll replace my stubs soon, and (ii) I don't want to create a
convention for non-real implementations.

+
 #if defined(OS_ANDROID)
 bool RegisterTouchDeviceAndroid(JNIEnv* env);
 #endif