Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 45623005: [NOT FOR REVIEW] Patch demonstrating the changes required for browser side fling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 2 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
Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index ab259fded8d4a13f0a015d4bbe9c5a88ff8de704..a0d8059d6498a1f52063a6bf55aee6578e6205b7 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -9,7 +9,7 @@
#include "base/timer/timer.h"
#include "content/browser/browser_thread_impl.h"
#include "content/browser/renderer_host/backing_store.h"
-#include "content/browser/renderer_host/input/gesture_event_filter.h"
+#include "content/browser/renderer_host/input/base_gesture_event_filter.h"
#include "content/browser/renderer_host/input/immediate_input_router.h"
#include "content/browser/renderer_host/input/synthetic_web_input_event_builders.h"
#include "content/browser/renderer_host/input/tap_suppression_controller.h"
@@ -244,7 +244,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
}
bool FlingInProgress() const {
- return gesture_event_filter()->fling_in_progress_;
+ return immediate_input_router_->flinger_->fling_in_progress_;
}
bool WillIgnoreNextACK() const {
@@ -315,12 +315,12 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
return immediate_input_router_->touch_event_queue_.get();
}
- const GestureEventFilter* gesture_event_filter() const {
- return immediate_input_router_->gesture_event_filter_.get();
+ const BaseGestureEventFilter* gesture_event_filter() const {
+ return immediate_input_router_->event_filter_.get();
}
- GestureEventFilter* gesture_event_filter() {
- return immediate_input_router_->gesture_event_filter_.get();
+ BaseGestureEventFilter* gesture_event_filter() {
+ return immediate_input_router_->event_filter_.get();
}
private:

Powered by Google App Engine
This is Rietveld 408576698