| Index: cc/input/input_handler.h
|
| diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h
|
| index b81ee998f1fc7be74004c99e45158e5bf903d027..8aac2def74619fa683edb297e894ce948a2e0499 100644
|
| --- a/cc/input/input_handler.h
|
| +++ b/cc/input/input_handler.h
|
| @@ -100,10 +100,7 @@ class CC_EXPORT InputHandler {
|
| };
|
|
|
| enum ScrollInputType {
|
| - // TODO(dtapuska): crbug.com/593017; Remove GESTURE and just use
|
| - // TOUCHSCREEN.
|
| - GESTURE,
|
| - TOUCHSCREEN = GESTURE,
|
| + TOUCHSCREEN,
|
| WHEEL,
|
| ANIMATED_WHEEL,
|
| NON_BUBBLING_GESTURE
|
|
|