content/browser/renderer_host/render_widget_host_impl.cc - Issue 235003005: 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 235003005: Consolidate all touch/gesture related constants in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updates 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

« content/browser/renderer_host/input/input_router_config_helper.cc ('K') | « 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 51726338843c3ff377a1d2e486b158e1b83749da..94baf51cdb4ed1dfff988b05512fe101401b46d4 100644

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

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

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

#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"

@@ -229,7 +230,8 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,

accessibility_mode_ =

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

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

+ input_router_.reset(new InputRouterImpl(

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

jdduke (slow) 2014/04/30 19:42:34 I thought of making this a method on the View, but

tdresser 2014/05/01 13:51:56 Sorry, which method are you referring to here?

touch_emulator_.reset();

@@ -1218,7 +1220,8 @@ void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status,

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_));

+ input_router_.reset(new InputRouterImpl(

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

if (overscroll_controller_)

overscroll_controller_->Reset();