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

Unified Diff: content/browser/renderer_host/input/immediate_input_router.h

Issue 43203004: Remove GestureEventFilter and clean up related bits assuming that we turn on Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/input/immediate_input_router.h
diff --git a/content/browser/renderer_host/input/immediate_input_router.h b/content/browser/renderer_host/input/immediate_input_router.h
index 0b78d9d1f455c624488e412bdd3335c50ce9adff..8aaab116f1108036ea848d9bc3ca293471484a4f 100644
--- a/content/browser/renderer_host/input/immediate_input_router.h
+++ b/content/browser/renderer_host/input/immediate_input_router.h
@@ -14,7 +14,6 @@
#include "content/browser/renderer_host/input/gesture_event_filter_client.h"
#include "content/browser/renderer_host/input/input_router.h"
#include "content/browser/renderer_host/input/touch_event_queue.h"
-#include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
#include "content/public/browser/native_web_keyboard_event.h"
namespace IPC {
@@ -38,7 +37,6 @@ class CONTENT_EXPORT ImmediateInputRouter
: public NON_EXPORTED_BASE(InputRouter),
public NON_EXPORTED_BASE(GestureEventFilterClient),
public NON_EXPORTED_BASE(TouchEventQueueClient),
- public NON_EXPORTED_BASE(TouchpadTapSuppressionControllerClient),
public NON_EXPORTED_BASE(FlingHelper) {
public:
ImmediateInputRouter(IPC::Sender* sender,
@@ -72,7 +70,6 @@ private:
friend class ImmediateInputRouterTest;
friend class MockRenderWidgetHost;
- // TouchpadTapSuppressionControllerClient
virtual void SendMouseEventImmediately(
const MouseEventWithLatencyInfo& mouse_event) OVERRIDE;
@@ -177,8 +174,6 @@ private:
int routing_id() const { return routing_id_; }
- BaseGestureEventFilter* gesture_event_filter();
-
IPC::Sender* sender_;
InputRouterClient* client_;
InputAckHandler* ack_handler_;
@@ -243,8 +238,7 @@ private:
scoped_ptr<TouchEventQueue> touch_event_queue_;
scoped_ptr<Flinger> flinger_;
- class EventFilteringHelper;
- scoped_ptr<EventFilteringHelper> event_filter_;
+ scoped_ptr<BaseGestureEventFilter> event_filter_;
enum InputMessageSource {
MESSAGE_SOURCE_FLING,

Powered by Google App Engine
This is Rietveld 408576698