summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/overscroll_controller.cc
diff options
context:
space:
mode:
authorjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 04:36:18 +0000
committerjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 04:36:18 +0000
commitbfb710966551abcf8165e58c01ce74aa204b62db (patch)
tree2acb1bc6e42a795a32c2879f74c131bd817e7631 /content/browser/renderer_host/overscroll_controller.cc
parent2c92cb4dc65f8de277b59486aa38581d828c7fdb (diff)
downloadchromium_src-bfb710966551abcf8165e58c01ce74aa204b62db.zip
chromium_src-bfb710966551abcf8165e58c01ce74aa204b62db.tar.gz
chromium_src-bfb710966551abcf8165e58c01ce74aa204b62db.tar.bz2
Create standalone GestureEventFilter unit tests
Move GestureEventFilter-related tests from the general router tests to the more specific GestureEventFilterTest. Create GestureEventFilterClient and TouchpadTapSuppressionControllerClient interfaces to remove explicit InputRouter dependencies. BUG=301807,302592 Review URL: https://codereview.chromium.org/26376002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/overscroll_controller.cc')
-rw-r--r--content/browser/renderer_host/overscroll_controller.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc
index 2bbd033..f07efab 100644
--- a/content/browser/renderer_host/overscroll_controller.cc
+++ b/content/browser/renderer_host/overscroll_controller.cc
@@ -4,7 +4,6 @@
#include "content/browser/renderer_host/overscroll_controller.h"
-#include "content/browser/renderer_host/input/gesture_event_filter.h"
#include "content/browser/renderer_host/overscroll_controller_delegate.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/public/browser/overscroll_configuration.h"
@@ -105,7 +104,6 @@ bool OverscrollController::WillDispatchEvent(
void OverscrollController::ReceivedEventACK(const WebKit::WebInputEvent& event,
bool processed) {
- DCHECK(!GestureEventFilter::IsGestureEventTypeAsync(event.type));
if (processed) {
// If a scroll event is consumed by the page, i.e. some content on the page
// has been scrolled, then there is not going to be an overscroll gesture,