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

ui/base/touch/touch_device_win.cc

Index: ui/base/touch/touch_device_win.cc
diff --git a/ui/base/touch/touch_device_win.cc b/ui/base/touch/touch_device_win.cc
index 0e1655f40b2a5568f1e42abc2ef401eb2fb0a535..414648b756cfbfacea87fbd553b0eb45718d8717 100644
--- a/ui/base/touch/touch_device_win.cc
+++ b/ui/base/touch/touch_device_win.cc
@@ -32,16 +32,8 @@ int GetAvailablePointerTypes() {
 }
 
 int GetAvailableHoverTypes() {
-  int available_hover_types = 0;
-  if (IsTouchDevicePresent())
-    available_hover_types |= HOVER_TYPE_ON_DEMAND;
-  if (GetSystemMetrics(SM_MOUSEPRESENT) != 0)
-    available_hover_types |= HOVER_TYPE_HOVER;
-
-  if (available_hover_types == 0)
-    available_hover_types = HOVER_TYPE_NONE;
-
-  return available_hover_types;
+  return (GetSystemMetrics(SM_MOUSEPRESENT) != 0) ? HOVER_TYPE_HOVER

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

Again there should still be three possible states here:

Mouse-only: HOVER_TYPE_HOVER
Touch-only: HOVER_TYPE_NONE
No input devices: HOVER_TYPE_NONE
Mouse+touch: HOVER_TYPE_HOVER | HOVER_TYPE_NONE

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

Done.

+                                                  : HOVER_TYPE_NONE;
 }
 
 }  // namespace
@@ -72,8 +64,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;
 }