| Index: ui/events/blink/input_handler_proxy.h
|
| diff --git a/ui/events/blink/input_handler_proxy.h b/ui/events/blink/input_handler_proxy.h
|
| index 0aab864cd131331bb1f9e686108cf6b7564a3f85..d73ff9c3746f0768d9f393ebd5174690f216c20f 100644
|
| --- a/ui/events/blink/input_handler_proxy.h
|
| +++ b/ui/events/blink/input_handler_proxy.h
|
| @@ -62,9 +62,6 @@
|
| }
|
|
|
| void set_smooth_scroll_enabled(bool value) { smooth_scroll_enabled_ = value; }
|
| - void set_touchpad_and_wheel_scroll_latching_enabled(bool value) {
|
| - touchpad_and_wheel_scroll_latching_enabled_ = value;
|
| - }
|
|
|
| enum EventDisposition {
|
| DID_HANDLE,
|
| @@ -130,7 +127,7 @@
|
| // Helper functions for handling more complicated input events.
|
| EventDisposition HandleMouseWheel(
|
| const blink::WebMouseWheelEvent& event);
|
| - EventDisposition FlingScrollByMouseWheel(
|
| + EventDisposition ScrollByMouseWheel(
|
| const blink::WebMouseWheelEvent& event,
|
| cc::EventListenerProperties listener_properties);
|
| EventDisposition HandleGestureScrollBegin(
|
| @@ -238,7 +235,6 @@
|
|
|
| bool smooth_scroll_enabled_;
|
| bool uma_latency_reporting_enabled_;
|
| - bool touchpad_and_wheel_scroll_latching_enabled_;
|
|
|
| // The merged result of the last touch start with previous touch starts.
|
| // This value will get returned for subsequent TouchMove events to allow
|
|
|