Chromium Code Reviews| Index: content/browser/renderer_host/overscroll_controller.h |
| diff --git a/content/browser/renderer_host/overscroll_controller.h b/content/browser/renderer_host/overscroll_controller.h |
| index 92fa093bf13ca43776b97eb0c177686c99a70d08..213815f08eb6febc677df0e3094fe625512f80aa 100644 |
| --- a/content/browser/renderer_host/overscroll_controller.h |
| +++ b/content/browser/renderer_host/overscroll_controller.h |
| @@ -92,9 +92,7 @@ class OverscrollController { |
| // and the over scroll amount (i.e. |overscroll_mode_|, |overscroll_delta_x_| |
| // and |overscroll_delta_y_|). Returns true if overscroll was handled by the |
| // delegate. |
| - bool ProcessOverscroll(float delta_x, |
| - float delta_y, |
| - blink::WebInputEvent::Type event_type); |
| + bool ProcessOverscroll(float delta_x, float delta_y, bool is_touchpad); |
|
tdresser
2016/02/18 14:35:21
I slightly prefer sending the type here, as it mak
dtapuska
2016/02/18 14:41:17
ProcessOverscroll is called both from MouseWheel a
|
| // Completes the desired action from the current gesture. |
| void CompleteAction(); |
| @@ -121,6 +119,7 @@ class OverscrollController { |
| // The delegate that receives the overscroll updates. The delegate is not |
| // owned by this controller. |
| OverscrollControllerDelegate* delegate_; |
| + bool use_gesutre_wheel_scrolling_; |
| DISALLOW_COPY_AND_ASSIGN(OverscrollController); |
| }; |