Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ | 5 #ifndef UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ |
| 6 #define UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ | 6 #define UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "ui/events/event.h" | 9 #include "ui/events/event.h" |
| 10 #include "ui/events/events_export.h" | 10 #include "ui/events/events_export.h" |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 27 public: | 27 public: |
| 28 GestureProviderAura(GestureProviderAuraClient* client); | 28 GestureProviderAura(GestureProviderAuraClient* client); |
| 29 virtual ~GestureProviderAura(); | 29 virtual ~GestureProviderAura(); |
| 30 | 30 |
| 31 bool OnTouchEvent(const TouchEvent& event); | 31 bool OnTouchEvent(const TouchEvent& event); |
| 32 void OnTouchEventAck(bool event_consumed); | 32 void OnTouchEventAck(bool event_consumed); |
| 33 const MotionEventAura& pointer_state() { return pointer_state_; } | 33 const MotionEventAura& pointer_state() { return pointer_state_; } |
| 34 | 34 |
| 35 // GestureProviderClient implementation | 35 // GestureProviderClient implementation |
| 36 virtual void OnGestureEvent(const GestureEventData& gesture) OVERRIDE; | 36 virtual void OnGestureEvent(const GestureEventData& gesture) OVERRIDE; |
| 37 ScopedVector<GestureEvent>* GetAndResetPendingGestures(); | |
|
sadrul
2014/06/02 13:31:23
This should go above the override (i.e. in line ~3
tdresser
2014/06/02 14:00:38
Done.
| |
| 37 | 38 |
| 38 private: | 39 private: |
| 39 bool IsConsideredDoubleTap(const GestureEventData& previous_tap, | 40 bool IsConsideredDoubleTap(const GestureEventData& previous_tap, |
| 40 const GestureEventData& current_tap) const; | 41 const GestureEventData& current_tap) const; |
| 41 | 42 |
| 42 scoped_ptr<GestureEventData> previous_tap_; | 43 scoped_ptr<GestureEventData> previous_tap_; |
| 43 | 44 |
| 44 GestureProviderAuraClient* client_; | 45 GestureProviderAuraClient* client_; |
| 45 MotionEventAura pointer_state_; | 46 MotionEventAura pointer_state_; |
| 46 FilteredGestureProvider filtered_gesture_provider_; | 47 FilteredGestureProvider filtered_gesture_provider_; |
| 47 | 48 |
| 48 int last_touch_event_flags_; | 49 int last_touch_event_flags_; |
| 50 bool handling_event_; | |
| 51 ScopedVector<GestureEvent> pending_gestures_; | |
| 49 | 52 |
| 50 DISALLOW_COPY_AND_ASSIGN(GestureProviderAura); | 53 DISALLOW_COPY_AND_ASSIGN(GestureProviderAura); |
| 51 }; | 54 }; |
| 52 | 55 |
| 53 } // namespace ui | 56 } // namespace ui |
| 54 | 57 |
| 55 #endif // UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ | 58 #endif // UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ |
| OLD | NEW |