Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Unified Diff: ui/base/touch/touch_device_android.cc

Issue 2673963002: Drop hover:on-demand support & let touch-screens report "none" instead. (Closed)
Patch Set: Fixed a "yikes!" Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/touch/touch_device.h ('k') | ui/base/touch/touch_device_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/touch/touch_device_android.cc
diff --git a/ui/base/touch/touch_device_android.cc b/ui/base/touch/touch_device_android.cc
index b8a458e8300467d6cd711fc4745f9cb7cf19f578..fdb4a82f5b653bdf82303660bfd921833ae39b5a 100644
--- a/ui/base/touch/touch_device_android.cc
+++ b/ui/base/touch/touch_device_android.cc
@@ -45,12 +45,10 @@ PointerType GetPrimaryPointerType(int available_pointer_types) {
}
HoverType GetPrimaryHoverType(int available_hover_types) {
- 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_EQ(available_hover_types, HOVER_TYPE_NONE);
- return HOVER_TYPE_NONE;
+ if (available_hover_types & HOVER_TYPE_NONE)
+ return HOVER_TYPE_NONE;
+ DCHECK_EQ(available_hover_types, HOVER_TYPE_HOVER);
+ return HOVER_TYPE_HOVER;
}
} // namespace ui
« no previous file with comments | « ui/base/touch/touch_device.h ('k') | ui/base/touch/touch_device_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698