| 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..97f8f5fb6a8b9e145221c735415401ddf64c1a92 100644
|
| --- a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
|
| +++ b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
|
| @@ -6,6 +6,7 @@
|
| #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 +28,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 +53,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 +60,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);
|
| };
|
|
|