| 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 26554862ef7e8b376699486f02d5bbc5ae5bd427..303d6d4a9066d21cece0d275395194e1c0d05404 100644
|
| --- a/ui/base/touch/touch_device_win.cc
|
| +++ b/ui/base/touch/touch_device_win.cc
|
| @@ -17,6 +17,28 @@ bool IsTouchDevicePresent() {
|
| ((value & NID_INTEGRATED_TOUCH) || (value & NID_EXTERNAL_TOUCH));
|
| }
|
|
|
| +PointerType GetPrimaryPointerType(int available_pointer_types) {
|
| + 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;
|
| +}
|
| +
|
| +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;
|
| +}
|
| +
|
| } // namespace
|
|
|
| TouchScreensAvailability GetTouchScreensAvailability() {
|
| @@ -33,6 +55,10 @@ int MaxTouchPoints() {
|
| return GetSystemMetrics(SM_MAXIMUMTOUCHES);
|
| }
|
|
|
| +std::pair<int, int> GetAvailablePointerAndHoverTypes() {
|
| + return std::make_pair(GetAvailablePointerTypes(), GetAvailableHoverTypes());
|
| +}
|
| +
|
| int GetAvailablePointerTypes() {
|
| int available_pointer_types = 0;
|
| if (IsTouchDevicePresent())
|
| @@ -47,31 +73,7 @@ int GetAvailablePointerTypes() {
|
| return available_pointer_types;
|
| }
|
|
|
| -PointerType GetPrimaryPointerType() {
|
| - 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;
|
| -}
|
| -
|
| -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;
|
| -}
|
| -
|
| -HoverType GetPrimaryHoverType() {
|
| - int available_hover_types = GetAvailableHoverTypes();
|
| +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)
|
|
|