Drop hover:on-demand support & let touch-screens report "none" instead.

ui/base/touch/touch_device_linux.cc

Index: ui/base/touch/touch_device_linux.cc
diff --git a/ui/base/touch/touch_device_linux.cc b/ui/base/touch/touch_device_linux.cc
index 6b5460d8daaebcb0cf69253d15096bc7dcbd91e7..73c8ef89ae55fa35d1c14187392ee8df836e08db 100644
--- a/ui/base/touch/touch_device_linux.cc
+++ b/ui/base/touch/touch_device_linux.cc
@@ -28,13 +28,7 @@ int GetAvailablePointerTypes() {
 
 // TODO(mustaq@chromium.org): Use mouse detection logic. crbug.com/495634
 int GetAvailableHoverTypes() {
-  // 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;
+  return HOVER_TYPE_HOVER;

[Rick Byers, 2017/02/06 16:35:22]

I think we still want HOVER_TYPE_NONE | HOVER_TYPE_HOVER in the
TouchDevicePresent case.  I.e. 'any-hover:none' is still expected to evaluate to
true on a touchscreen laptop.

[mustaq, 2017/02/06 17:13:02]

Done.

 }
 
 }  // namespace
@@ -75,8 +69,6 @@ PointerType GetPrimaryPointerType(int available_pointer_types) {
 HoverType GetPrimaryHoverType(int available_hover_types) {
   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;
 }