content/browser/renderer_host/render_widget_host_impl.cc - Issue 260923003: Revert of Consolidate all touch/gesture related constants in content

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/browser/renderer_host/render_widget_host_impl.cc

Issue 260923003: Revert of Consolidate all touch/gesture related constants in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 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/browser/renderer_host/input/touchscreen_tap_suppression_controller_stub.cc ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_impl.cc

diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc

index f01a2e75e141b978c5d83a2f8d135a895ba2ba98..c464a51aa9e90e999c9e7886f2cc8b95838a49a0 100644

--- a/content/browser/renderer_host/render_widget_host_impl.cc

+++ b/content/browser/renderer_host/render_widget_host_impl.cc

@@ -31,7 +31,6 @@

#include "content/browser/gpu/gpu_process_host_ui_shim.h"

#include "content/browser/gpu/gpu_surface_tracker.h"

#include "content/browser/renderer_host/dip_util.h"

-#include "content/browser/renderer_host/input/input_router_config_helper.h"

#include "content/browser/renderer_host/input/input_router_impl.h"

#include "content/browser/renderer_host/input/synthetic_gesture.h"

#include "content/browser/renderer_host/input/synthetic_gesture_controller.h"

@@ -230,8 +229,7 @@

accessibility_mode_ =

BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode();

- input_router_.reset(new InputRouterImpl(

- process_, this, this, routing_id_, GetInputRouterConfigForPlatform()));

+ input_router_.reset(new InputRouterImpl(process_, this, this, routing_id_));

touch_emulator_.reset();

@@ -1220,8 +1218,7 @@

waiting_for_screen_rects_ack_ = false;

// Reset to ensure that input routing works with a new renderer.

- input_router_.reset(new InputRouterImpl(

- process_, this, this, routing_id_, GetInputRouterConfigForPlatform()));

+ input_router_.reset(new InputRouterImpl(process_, this, this, routing_id_));

if (overscroll_controller_)

overscroll_controller_->Reset();