Index: content/renderer/input/input_handler_manager.cc |
diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc |
index b6deb4c0b187c2064f916160e10aa46aff04cebb..faeb8adc352d80b86f8c1bb6fee2efa2ad6dff5e 100644 |
--- a/content/renderer/input/input_handler_manager.cc |
+++ b/content/renderer/input/input_handler_manager.cc |
@@ -67,20 +67,18 @@ void InputHandlerManager::AddInputHandler( |
int routing_id, |
const base::WeakPtr<cc::InputHandler>& input_handler, |
const base::WeakPtr<RenderViewImpl>& render_view_impl, |
- bool enable_smooth_scrolling, |
- bool enable_wheel_gestures) { |
+ bool enable_smooth_scrolling) { |
if (task_runner_->BelongsToCurrentThread()) { |
AddInputHandlerOnCompositorThread( |
routing_id, base::ThreadTaskRunnerHandle::Get(), input_handler, |
- render_view_impl, enable_smooth_scrolling, enable_wheel_gestures); |
+ render_view_impl, enable_smooth_scrolling); |
} else { |
task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&InputHandlerManager::AddInputHandlerOnCompositorThread, |
base::Unretained(this), routing_id, |
base::ThreadTaskRunnerHandle::Get(), input_handler, |
- render_view_impl, enable_smooth_scrolling, |
- enable_wheel_gestures)); |
+ render_view_impl, enable_smooth_scrolling)); |
} |
} |
@@ -89,8 +87,7 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread( |
const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, |
const base::WeakPtr<cc::InputHandler>& input_handler, |
const base::WeakPtr<RenderViewImpl>& render_view_impl, |
- bool enable_smooth_scrolling, |
- bool enable_wheel_gestures) { |
+ bool enable_smooth_scrolling) { |
DCHECK(task_runner_->BelongsToCurrentThread()); |
// The handler could be gone by this point if the compositor has shut down. |
@@ -104,9 +101,9 @@ void InputHandlerManager::AddInputHandlerOnCompositorThread( |
TRACE_EVENT1("input", |
"InputHandlerManager::AddInputHandlerOnCompositorThread", |
"result", "AddingRoute"); |
- std::unique_ptr<InputHandlerWrapper> wrapper(new InputHandlerWrapper( |
- this, routing_id, main_task_runner, input_handler, render_view_impl, |
- enable_smooth_scrolling, enable_wheel_gestures)); |
+ std::unique_ptr<InputHandlerWrapper> wrapper( |
+ new InputHandlerWrapper(this, routing_id, main_task_runner, input_handler, |
+ render_view_impl, enable_smooth_scrolling)); |
client_->DidAddInputHandler(routing_id); |
if (synchronous_handler_proxy_client_) { |
synchronous_handler_proxy_client_->DidAddSynchronousHandlerProxy( |