| Index: ui/base/touch/touch_device.cc
|
| diff --git a/ui/base/touch/touch_device.cc b/ui/base/touch/touch_device.cc
|
| index 5b02be22965a4e56845470359660ccefaabd7acb..f29070abbc5daef40c03be59c32c33f82129dc75 100644
|
| --- a/ui/base/touch/touch_device.cc
|
| +++ b/ui/base/touch/touch_device.cc
|
| @@ -16,22 +16,17 @@ int MaxTouchPoints() {
|
| return 0;
|
| }
|
|
|
| -int GetAvailablePointerTypes() {
|
| +std::pair<int, int> GetAvailablePointerAndHoverTypes() {
|
| // Assume a non-touch-device with a mouse
|
| - return POINTER_TYPE_FINE;
|
| + return std::make_pair(POINTER_TYPE_FINE, HOVER_TYPE_HOVER);
|
| }
|
|
|
| -PointerType GetPrimaryPointerType() {
|
| +PointerType GetPrimaryPointerType(int available_pointer_types) {
|
| // Assume a non-touch-device with a mouse
|
| return POINTER_TYPE_FINE;
|
| }
|
|
|
| -int GetAvailableHoverTypes() {
|
| - // Assume a non-touch-device with a mouse
|
| - return HOVER_TYPE_HOVER;
|
| -}
|
| -
|
| -HoverType GetPrimaryHoverType() {
|
| +HoverType GetPrimaryHoverType(int available_hover_types) {
|
| // Assume a non-touch-device with a mouse
|
| return HOVER_TYPE_HOVER;
|
| }
|
|
|