Pointer/hover media query support: platform-dependent changes

ui/base/touch/touch_device_android.cc

Index: ui/base/touch/touch_device_android.cc
diff --git a/ui/base/touch/touch_device_android.cc b/ui/base/touch/touch_device_android.cc
index 604306c8bb38ff71a6072db2e6514cfa36fef31e..565aae2fe9f06299fd95487677caadf976fe561e 100644
--- a/ui/base/touch/touch_device_android.cc
+++ b/ui/base/touch/touch_device_android.cc
@@ -4,6 +4,7 @@
 
 #include "ui/base/touch/touch_device.h"
 
+#include "base/logging.h"
 #include "jni/TouchDevice_jni.h"
 
 namespace ui {
@@ -19,6 +20,42 @@ int MaxTouchPoints() {
   return static_cast<int>(max_touch_points);
 }
 
+int AvailablePointerTypes() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  jobject context = base::android::GetApplicationContext();
+  jint available_pointer_types =
+      Java_TouchDevice_availablePointerTypes(env, context);

[Ted C, 2014/12/03 20:31:31]

I think you should be able to just return this instead of static casting to int
(at least I think you can).

+  return static_cast<int>(available_pointer_types);
+}
+
+PointerType PrimaryPointerType() {
+  int available_pointer_types = AvailablePointerTypes();
+  if (available_pointer_types & POINTER_TYPE_COARSE)
+    return POINTER_TYPE_COARSE;
+  if (available_pointer_types & POINTER_TYPE_FINE)
+    return POINTER_TYPE_FINE;
+  DCHECK(available_pointer_types & POINTER_TYPE_NONE);
+  return POINTER_TYPE_NONE;
+}
+
+int AvailableHoverTypes() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  jobject context = base::android::GetApplicationContext();
+  jint available_hover_types =
+      Java_TouchDevice_availableHoverTypes(env, context);
+  return static_cast<int>(available_hover_types);
+}
+
+HoverType PrimaryHoverType() {
+  int available_hover_types = AvailableHoverTypes();
+  if (available_hover_types & HOVER_TYPE_ON_DEMAND)
+    return HOVER_TYPE_ON_DEMAND;
+  if (available_hover_types & HOVER_TYPE_HOVER)
+    return HOVER_TYPE_HOVER;
+  DCHECK(available_hover_types & HOVER_TYPE_NONE);
+  return HOVER_TYPE_NONE;
+}
+
 bool RegisterTouchDeviceAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }