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

Side by Side Diff: ui/events/gestures/gesture_recognizer_impl.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_GESTURES_GESTURE_RECOGNIZER_IMPL_H_ 5 #ifndef UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
6 #define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_ 6 #define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 19 matching lines...) Expand all
30 public: 30 public:
31 typedef std::map<int, GestureConsumer*> TouchIdToConsumerMap; 31 typedef std::map<int, GestureConsumer*> TouchIdToConsumerMap;
32 32
33 GestureRecognizerImpl(); 33 GestureRecognizerImpl();
34 virtual ~GestureRecognizerImpl(); 34 virtual ~GestureRecognizerImpl();
35 35
36 std::vector<GestureEventHelper*>& helpers() { return helpers_; } 36 std::vector<GestureEventHelper*>& helpers() { return helpers_; }
37 37
38 // Overridden from GestureRecognizer 38 // Overridden from GestureRecognizer
39 virtual GestureConsumer* GetTouchLockedTarget( 39 virtual GestureConsumer* GetTouchLockedTarget(
40 const TouchEvent& event) OVERRIDE; 40 const TouchEvent& event) override;
41 virtual GestureConsumer* GetTargetForGestureEvent( 41 virtual GestureConsumer* GetTargetForGestureEvent(
42 const GestureEvent& event) OVERRIDE; 42 const GestureEvent& event) override;
43 virtual GestureConsumer* GetTargetForLocation( 43 virtual GestureConsumer* GetTargetForLocation(
44 const gfx::PointF& location, int source_device_id) OVERRIDE; 44 const gfx::PointF& location, int source_device_id) override;
45 virtual void TransferEventsTo(GestureConsumer* current_consumer, 45 virtual void TransferEventsTo(GestureConsumer* current_consumer,
46 GestureConsumer* new_consumer) OVERRIDE; 46 GestureConsumer* new_consumer) override;
47 virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer, 47 virtual bool GetLastTouchPointForTarget(GestureConsumer* consumer,
48 gfx::PointF* point) OVERRIDE; 48 gfx::PointF* point) override;
49 virtual bool CancelActiveTouches(GestureConsumer* consumer) OVERRIDE; 49 virtual bool CancelActiveTouches(GestureConsumer* consumer) override;
50 50
51 protected: 51 protected:
52 virtual GestureProviderAura* GetGestureProviderForConsumer( 52 virtual GestureProviderAura* GetGestureProviderForConsumer(
53 GestureConsumer* c); 53 GestureConsumer* c);
54 54
55 private: 55 private:
56 // Sets up the target consumer for gestures based on the touch-event. 56 // Sets up the target consumer for gestures based on the touch-event.
57 void SetupTargets(const TouchEvent& event, GestureConsumer* consumer); 57 void SetupTargets(const TouchEvent& event, GestureConsumer* consumer);
58 58
59 void DispatchGestureEvent(GestureEvent* event); 59 void DispatchGestureEvent(GestureEvent* event);
60 60
61 // Overridden from GestureRecognizer 61 // Overridden from GestureRecognizer
62 virtual bool ProcessTouchEventPreDispatch(const TouchEvent& event, 62 virtual bool ProcessTouchEventPreDispatch(const TouchEvent& event,
63 GestureConsumer* consumer) OVERRIDE; 63 GestureConsumer* consumer) override;
64 64
65 virtual Gestures* ProcessTouchEventPostDispatch( 65 virtual Gestures* ProcessTouchEventPostDispatch(
66 const TouchEvent& event, 66 const TouchEvent& event,
67 ui::EventResult result, 67 ui::EventResult result,
68 GestureConsumer* consumer) OVERRIDE; 68 GestureConsumer* consumer) override;
69 69
70 virtual Gestures* ProcessTouchEventOnAsyncAck( 70 virtual Gestures* ProcessTouchEventOnAsyncAck(
71 const TouchEvent& event, 71 const TouchEvent& event,
72 ui::EventResult result, 72 ui::EventResult result,
73 GestureConsumer* consumer) OVERRIDE; 73 GestureConsumer* consumer) override;
74 74
75 virtual bool CleanupStateForConsumer(GestureConsumer* consumer) 75 virtual bool CleanupStateForConsumer(GestureConsumer* consumer)
76 OVERRIDE; 76 override;
77 virtual void AddGestureEventHelper(GestureEventHelper* helper) OVERRIDE; 77 virtual void AddGestureEventHelper(GestureEventHelper* helper) override;
78 virtual void RemoveGestureEventHelper(GestureEventHelper* helper) OVERRIDE; 78 virtual void RemoveGestureEventHelper(GestureEventHelper* helper) override;
79 79
80 // Overridden from GestureProviderAuraClient 80 // Overridden from GestureProviderAuraClient
81 virtual void OnGestureEvent(GestureEvent* event) OVERRIDE; 81 virtual void OnGestureEvent(GestureEvent* event) override;
82 82
83 // Convenience method to find the GestureEventHelper that can dispatch events 83 // Convenience method to find the GestureEventHelper that can dispatch events
84 // to a specific |consumer|. 84 // to a specific |consumer|.
85 GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer); 85 GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer);
86 std::map<GestureConsumer*, GestureProviderAura*> consumer_gesture_provider_; 86 std::map<GestureConsumer*, GestureProviderAura*> consumer_gesture_provider_;
87 87
88 // Both |touch_id_target_| and |touch_id_target_for_gestures_| map a touch-id 88 // Both |touch_id_target_| and |touch_id_target_for_gestures_| map a touch-id
89 // to its target window. touch-ids are removed from |touch_id_target_| on 89 // to its target window. touch-ids are removed from |touch_id_target_| on
90 // ET_TOUCH_RELEASE and ET_TOUCH_CANCEL. |touch_id_target_for_gestures_| are 90 // ET_TOUCH_RELEASE and ET_TOUCH_CANCEL. |touch_id_target_for_gestures_| are
91 // removed in ConsumerDestroyed(). 91 // removed in ConsumerDestroyed().
92 TouchIdToConsumerMap touch_id_target_; 92 TouchIdToConsumerMap touch_id_target_;
93 TouchIdToConsumerMap touch_id_target_for_gestures_; 93 TouchIdToConsumerMap touch_id_target_for_gestures_;
94 94
95 std::vector<GestureEventHelper*> helpers_; 95 std::vector<GestureEventHelper*> helpers_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl); 97 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl);
98 }; 98 };
99 99
100 // Provided only for testing: 100 // Provided only for testing:
101 EVENTS_EXPORT void SetGestureRecognizerForTesting( 101 EVENTS_EXPORT void SetGestureRecognizerForTesting(
102 GestureRecognizer* gesture_recognizer); 102 GestureRecognizer* gesture_recognizer);
103 103
104 } // namespace ui 104 } // namespace ui
105 105
106 #endif // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_ 106 #endif // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
OLDNEW
« no previous file with comments | « ui/events/gestures/gesture_provider_aura_unittest.cc ('k') | ui/events/gestures/gesture_recognizer_impl_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698