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

Unified Diff: ui/events/gestures/gesture_recognizer_impl.h

Issue 458363002: Remove old Aura Gesture Detection Pipeline. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address sadrul's comment, and rebase. Created 6 years, 4 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
« no previous file with comments | « ui/events/gestures/gesture_provider_aura.h ('k') | ui/events/gestures/gesture_recognizer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gestures/gesture_recognizer_impl.h
diff --git a/ui/events/gestures/gesture_recognizer_impl.h b/ui/events/gestures/gesture_recognizer_impl.h
index b2e8106498eb81a5446fd43d61c1ff506d0bbf5f..46bf74910f0a4dfa0dd53754560641fff974ed70 100644
--- a/ui/events/gestures/gesture_recognizer_impl.h
+++ b/ui/events/gestures/gesture_recognizer_impl.h
@@ -14,21 +14,18 @@
#include "ui/events/events_export.h"
#include "ui/events/gestures/gesture_provider_aura.h"
#include "ui/events/gestures/gesture_recognizer.h"
-#include "ui/events/gestures/gesture_sequence.h"
#include "ui/gfx/point.h"
namespace ui {
class GestureConsumer;
class GestureEvent;
class GestureEventHelper;
-class GestureSequence;
class TouchEvent;
// TODO(tdresser): Once the unified gesture recognition process sticks
// (crbug.com/332418), GestureRecognizerImpl can be cleaned up
// significantly.
class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
- public GestureSequenceDelegate,
public GestureProviderAuraClient {
public:
typedef std::map<int, GestureConsumer*> TouchIdToConsumerMap;
@@ -52,11 +49,8 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
virtual bool CancelActiveTouches(GestureConsumer* consumer) OVERRIDE;
protected:
- virtual GestureSequence* GetGestureSequenceForConsumer(GestureConsumer* c);
virtual GestureProviderAura* GetGestureProviderForConsumer(
GestureConsumer* c);
- virtual GestureSequence* CreateSequence(
- ui::GestureSequenceDelegate* delegate);
private:
// Sets up the target consumer for gestures based on the touch-event.
@@ -84,17 +78,12 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE;
- // Overridden from ui::GestureSequenceDelegate.
- virtual void DispatchPostponedGestureEvent(GestureEvent* event) OVERRIDE;
-
// Overridden from GestureProviderAuraClient
virtual void OnGestureEvent(GestureEvent* event) OVERRIDE;
// Convenience method to find the GestureEventHelper that can dispatch events
// to a specific |consumer|.
GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer);
-
- std::map<GestureConsumer*, GestureSequence*> consumer_sequence_;
std::map<GestureConsumer*, GestureProviderAura*> consumer_gesture_provider_;
// Both |touch_id_target_| and |touch_id_target_for_gestures_| map a touch-id
@@ -106,8 +95,6 @@ class EVENTS_EXPORT GestureRecognizerImpl : public GestureRecognizer,
std::vector<GestureEventHelper*> helpers_;
- bool use_unified_gesture_detector_;
-
DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl);
};
« no previous file with comments | « ui/events/gestures/gesture_provider_aura.h ('k') | ui/events/gestures/gesture_recognizer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698