Pointer/hover media query support: platform-dependent changes #2

ui/base/touch/touch_device_aurax11.cc

 // Copyright (c) 2013 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 "ui/events/devices/x11/touch_factory_x11.h"
 
 namespace ui {
 
 bool IsTouchDevicePresent() {
   return ui::TouchFactory::GetInstance()->IsTouchDevicePresent();
 }
 
 int MaxTouchPoints() {
   return ui::TouchFactory::GetInstance()->GetMaxTouchPoints();
 }
 
+// FIXME: Use mouse/keyboard detection logic. crbug.com/440503
 int GetAvailablePointerTypes() {
-  // TODO(mustaq): Replace the stub below
+  // Assume there is a keyboard
+  int available_pointer_types = POINTER_TYPE_NONE;

[sadrul, 2014/12/11 15:22:27]

You can look for a non-empty DeviceDataManager::keyboard_devices() here.

[mustaq, 2014/12/11 19:21:04]

Done.

+
+  // Assume either a touch-device or a mouse is there
+  if (IsTouchDevicePresent())
+    available_pointer_types |= POINTER_TYPE_COARSE;
+  else
+    available_pointer_types |= POINTER_TYPE_FINE;
+
+  return available_pointer_types;
+}
+
+PointerType GetPrimaryPointerType() {
+  int available_pointer_types = GetAvailablePointerTypes();
+  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;
 }
 
-PointerType GetPrimaryPointerType() {
-  // TODO(mustaq): Replace the stub below
-  return POINTER_TYPE_NONE;
+// FIXME: Use mouse/keyboard detection logic. crbug.com/440503
+int GetAvailableHoverTypes() {
+  // Assume there is a keyboard
+  int available_hover_types = HOVER_TYPE_NONE;

[sadrul, 2014/12/11 15:22:27]

ditto

[mustaq, 2014/12/11 19:21:04]

Done.

+
+  // Assume either a touch-device or a mouse is there
+  if (IsTouchDevicePresent())
+    available_hover_types |= HOVER_TYPE_ON_DEMAND;
+  else
+    available_hover_types |= HOVER_TYPE_HOVER;
+
+  return available_hover_types;
 }
 
-int GetAvailableHoverTypes() {
-  // TODO(mustaq): Replace the stub below
+HoverType GetPrimaryHoverType() {
+  int available_hover_types = GetAvailableHoverTypes();
+  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;
 }
 
-HoverType GetPrimaryHoverType() {
-  // TODO(mustaq): Replace the stub below
-  return HOVER_TYPE_NONE;
-}
-
 }  // namespace ui