Media queries: excluded non-pointing devices from pointer/hover

ui/base/touch/touch_device_ozone.cc

Index: ui/base/touch/touch_device_ozone.cc
diff --git a/ui/base/touch/touch_device_ozone.cc b/ui/base/touch/touch_device_ozone.cc
index f2f31587e22bcb37a1b12dc3872fa9788baedb30..66988914942001e740c1d93b42433307529b7155 100644
--- a/ui/base/touch/touch_device_ozone.cc
+++ b/ui/base/touch/touch_device_ozone.cc
@@ -4,11 +4,14 @@
 
 #include "ui/base/touch/touch_device.h"
 
+#include "base/logging.h"
+#include "ui/events/devices/device_data_manager.h"
+
 namespace ui {
 
 bool IsTouchDevicePresent() {
   // TODO(sadrul@chromium.org): Support evdev hotplugging.
-  return true;
+  return ui::DeviceDataManager::GetInstance()->touchscreen_devices().size() > 0;
 }
 
 int MaxTouchPoints() {
@@ -16,24 +19,46 @@ int MaxTouchPoints() {
   return 11;
 }
 
+// TODO(mustaq@chromium.org): Use mouse detection logic. crbug.com/440503
 int GetAvailablePointerTypes() {
-  // Assume a touch-device with a keyboard
-  return POINTER_TYPE_COARSE | POINTER_TYPE_NONE;
+  // Assume a mouse is there
+  int available_pointer_types = POINTER_TYPE_FINE;
+  if (IsTouchDevicePresent())
+    available_pointer_types |= POINTER_TYPE_COARSE;
+
+  DCHECK(available_pointer_types);
+  return available_pointer_types;
 }
 
 PointerType GetPrimaryPointerType() {
-  // Assume a touch-device with a keyboard
-  return POINTER_TYPE_COARSE;
+  int available_pointer_types = GetAvailablePointerTypes();
+  if (available_pointer_types & POINTER_TYPE_FINE)
+    return POINTER_TYPE_FINE;
+  if (available_pointer_types & POINTER_TYPE_COARSE)
+    return POINTER_TYPE_COARSE;
+  DCHECK_EQ(available_pointer_types, POINTER_TYPE_NONE);
+  return POINTER_TYPE_NONE;
 }
 
+// TODO(mustaq@chromium.org): Use mouse detection logic. crbug.com/440503
 int GetAvailableHoverTypes() {
-  // Assume a touch-device with a keyboard
-  return HOVER_TYPE_ON_DEMAND  | HOVER_TYPE_NONE;
+  // Assume a mouse is there
+  int available_hover_types = HOVER_TYPE_HOVER;
+  if (IsTouchDevicePresent())
+    available_hover_types |= HOVER_TYPE_ON_DEMAND;
+
+  DCHECK(available_hover_types);
+  return available_hover_types;
 }
 
 HoverType GetPrimaryHoverType() {
-  // Assume a touch-device with a keyboard
-  return HOVER_TYPE_ON_DEMAND;
+  int available_hover_types = GetAvailableHoverTypes();
+  if (available_hover_types & HOVER_TYPE_HOVER)
+    return HOVER_TYPE_HOVER;
+  if (available_hover_types & HOVER_TYPE_ON_DEMAND)
+    return HOVER_TYPE_ON_DEMAND;
+  DCHECK_EQ(available_hover_types, HOVER_TYPE_NONE);
+  return HOVER_TYPE_NONE;
 }
 
 }  // namespace ui