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

ui/base/touch/touch_device_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/touch/touch_device.h"
 
 #include "base/logging.h"
 #include "base/win/win_util.h"
 
 namespace ui {
@@ skipping 34 matching lines @@
   int available_pointer_types = POINTER_TYPE_FINE;
   if (IsTouchDevicePresent())
     available_pointer_types |= POINTER_TYPE_COARSE;
 
   return available_pointer_types;
 }
 
 // This method follows the same logic as above but with hover types.
 int GetAvailableHoverTypes() {
   if (base::win::IsTabletDevice(nullptr))
-    return HOVER_TYPE_ON_DEMAND;
-
-  if (GetSystemMetrics(SM_MOUSEPRESENT) == 0)
     return HOVER_TYPE_NONE;
 
-  int available_hover_types = HOVER_TYPE_HOVER;
-  if (IsTouchDevicePresent())
-    available_hover_types |= HOVER_TYPE_ON_DEMAND;
+  int available_hover_types;
+  if (GetSystemMetrics(SM_MOUSEPRESENT) != 0) {
+    available_hover_types = HOVER_TYPE_HOVER;
+    if (IsTouchDevicePresent())
+      available_hover_types |= HOVER_TYPE_NONE;
+  } else
+    available_hover_types = HOVER_TYPE_NONE;
 
   return available_hover_types;
 }
 
 }  // namespace
 
 TouchScreensAvailability GetTouchScreensAvailability() {
   if (!IsTouchDevicePresent())
     return TouchScreensAvailability::NONE;
 
@@ skipping 12 matching lines @@
     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;
 }
 
 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;
 }
 
 std::pair<int, int> GetAvailablePointerAndHoverTypes() {
   return std::make_pair(GetAvailablePointerTypes(), GetAvailableHoverTypes());
 }
 
 }  // namespace ui