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

Unified Diff: ui/events/blink/input_handler_proxy.cc

Issue 2050033002: Revert of Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Created 4 years, 6 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/events/blink/input_handler_proxy.h ('k') | ui/events/blink/input_handler_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/input_handler_proxy.cc
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc
index 9b13d93cd2496cb88dec75fdb796d236368319a6..811554176974f8afdcfe2a08b02ea5c5bb685d9b 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -239,6 +239,7 @@
has_fling_animation_started_(false),
smooth_scroll_enabled_(false),
uma_latency_reporting_enabled_(base::TimeTicks::IsHighResolution()),
+ use_gesture_events_for_mouse_wheel_(true),
touch_start_result_(kEventDispositionUndefined) {
DCHECK(client);
input_handler_->BindToClient(this);
@@ -449,6 +450,7 @@
if (!wheel_event.hasPreciseScrollingDeltas && fling_curve_)
CancelCurrentFling();
+ if (use_gesture_events_for_mouse_wheel_) {
cc::EventListenerProperties properties =
input_handler_->GetEventListenerProperties(
cc::EventListenerClass::kMouseWheel);
@@ -464,6 +466,8 @@
NOTREACHED();
return DROP_EVENT;
}
+ }
+ return ScrollByMouseWheel(wheel_event);
}
InputHandlerProxy::EventDisposition InputHandlerProxy::ScrollByMouseWheel(
« no previous file with comments | « ui/events/blink/input_handler_proxy.h ('k') | ui/events/blink/input_handler_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698