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

Unified Diff: content/renderer/input/input_handler_manager.cc

Issue 2047093002: Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Remove unused, uninitialized variable on mac causing occasional failure 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 | « content/renderer/input/input_handler_manager.h ('k') | content/renderer/input/input_handler_wrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « content/renderer/input/input_handler_manager.h ('k') | content/renderer/input/input_handler_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698