content/browser/renderer_host/input/touchpad_tap_suppression_controller.h - 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/input/touchpad_tap_suppression_controller.h

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

Patch Set: Compilation fixes 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/touch_event_queue_unittest.cc ('k') | content/browser/renderer_host/input/touchpad_tap_suppression_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/touchpad_tap_suppression_controller.h

diff --git a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h

index 64b2ed4bc2afe4fcc3ffb886f7bfd2063fa6e592..23e3ee4fdaf3b16ba38e8c3f938bfe1e933c5a5b 100644

--- a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h

+++ b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h

@@ -5,7 +5,7 @@

#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_

#define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_

-#include "base/memory/scoped_ptr.h"

+#include "content/browser/renderer_host/input/tap_suppression_controller.h"

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

#include "content/common/content_export.h"

#include "content/port/browser/event_with_latency_info.h"

@@ -27,8 +27,9 @@ class CONTENT_EXPORT TouchpadTapSuppressionControllerClient {

class TouchpadTapSuppressionController : public TapSuppressionControllerClient {

public:

// The |client| must outlive the TouchpadTapSupressionController.

- explicit TouchpadTapSuppressionController(

- TouchpadTapSuppressionControllerClient* client);

+ TouchpadTapSuppressionController(

+ TouchpadTapSuppressionControllerClient* client,

+ const TapSuppressionController::Config& config);

virtual ~TouchpadTapSuppressionController();

// Should be called on arrival of GestureFlingCancel events.

@@ -51,8 +52,6 @@ class TouchpadTapSuppressionController : public TapSuppressionControllerClient {

friend class MockRenderWidgetHost;

// TapSuppressionControllerClient implementation.

- virtual int MaxCancelToDownTimeInMs() OVERRIDE;

- virtual int MaxTapGapTimeInMs() OVERRIDE;

virtual void DropStashedTapDown() OVERRIDE;

virtual void ForwardStashedTapDown() OVERRIDE;

@@ -60,7 +59,7 @@ class TouchpadTapSuppressionController : public TapSuppressionControllerClient {

MouseEventWithLatencyInfo stashed_mouse_down_;

// The core controller of tap suppression.

- scoped_ptr<TapSuppressionController> controller_;

+ TapSuppressionController controller_;

DISALLOW_COPY_AND_ASSIGN(TouchpadTapSuppressionController);

};