content/renderer/render_view_impl.cc - Issue 2050033002: Revert of Remove enable/disable wheel gestures setting.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_view_impl.cc

Issue 2050033002: Revert of Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove

Patch Set: 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_wrapper.cc ('k') | content/shell/renderer/layout_test/layout_test_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index f3a0aab070df09b336eed79cfc74691e7b093a11..bacf673ef65b60a1b782491766b6abf20bd54ea7 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -50,6 +50,7 @@

#include "content/common/drag_messages.h"

#include "content/common/frame_messages.h"

#include "content/common/frame_replication_state.h"

+#include "content/common/input/input_event_utils.h"

#include "content/common/input_messages.h"

#include "content/common/page_messages.h"

#include "content/common/site_isolation_policy.h"

@@ -2062,7 +2063,8 @@

if (input_handler_manager) {

input_handler_manager->AddInputHandler(

GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),

- webkit_preferences_.enable_scroll_animator);

+ webkit_preferences_.enable_scroll_animator,

+ UseGestureBasedWheelScrolling());

}