Index: content/browser/renderer_host/input/touchpad_tap_suppression_controller.cc |
diff --git a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.cc b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.cc |
index 6ea11e7ff10d86c0ee6258405ba9ffa0f10b9fb4..d92077920277a2b6db8c6b0d757e556b1510aa2e 100644 |
--- a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.cc |
+++ b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.cc |
@@ -4,42 +4,45 @@ |
#include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h" |
+#include "content/browser/renderer_host/input/tap_suppression_controller.h" |
+#include "content/browser/renderer_host/input/tap_suppression_controller_client.h" |
+ |
+// The default implementation of the TouchpadTapSuppressionController does not |
+// suppress taps. Touchpad tap suppression is needed only on CrOS. |
+ |
namespace content { |
TouchpadTapSuppressionController::TouchpadTapSuppressionController( |
- TouchpadTapSuppressionControllerClient* client, |
- const TapSuppressionController::Config& config) |
- : client_(client), controller_(this, config) {} |
+ TouchpadTapSuppressionControllerClient* /* client */) |
+ : client_(NULL) {} |
TouchpadTapSuppressionController::~TouchpadTapSuppressionController() {} |
-void TouchpadTapSuppressionController::GestureFlingCancel() { |
- controller_.GestureFlingCancel(); |
-} |
+void TouchpadTapSuppressionController::GestureFlingCancel() {} |
-void TouchpadTapSuppressionController::GestureFlingCancelAck(bool processed) { |
- controller_.GestureFlingCancelAck(processed); |
+void TouchpadTapSuppressionController::GestureFlingCancelAck( |
+ bool /*processed*/) { |
} |
bool TouchpadTapSuppressionController::ShouldDeferMouseDown( |
- const MouseEventWithLatencyInfo& event) { |
- bool should_defer = controller_.ShouldDeferTapDown(); |
- if (should_defer) |
- stashed_mouse_down_ = event; |
- return should_defer; |
+ const MouseEventWithLatencyInfo& /*event*/) { |
+ return false; |
} |
-bool TouchpadTapSuppressionController::ShouldSuppressMouseUp() { |
- return controller_.ShouldSuppressTapEnd(); |
+bool TouchpadTapSuppressionController::ShouldSuppressMouseUp() { return false; } |
+ |
+int TouchpadTapSuppressionController::MaxCancelToDownTimeInMs() { |
+ return 0; |
+} |
+ |
+int TouchpadTapSuppressionController::MaxTapGapTimeInMs() { |
+ return 0; |
} |
void TouchpadTapSuppressionController::DropStashedTapDown() { |
} |
void TouchpadTapSuppressionController::ForwardStashedTapDown() { |
- // Mouse downs are not handled by gesture event filter; so, they are |
- // immediately forwarded to the renderer. |
- client_->SendMouseEventImmediately(stashed_mouse_down_); |
} |
} // namespace content |