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

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

Issue 2474163003: Remove stl_util's deletion function use from ui/. (Closed)
Patch Set: fix Created 4 years, 1 month 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void AddGestureEventHelper(GestureEventHelper* helper) override; 79 void AddGestureEventHelper(GestureEventHelper* helper) override;
80 void RemoveGestureEventHelper(GestureEventHelper* helper) override; 80 void RemoveGestureEventHelper(GestureEventHelper* helper) override;
81 81
82 // Overridden from GestureProviderAuraClient 82 // Overridden from GestureProviderAuraClient
83 void OnGestureEvent(GestureConsumer* raw_input_consumer, 83 void OnGestureEvent(GestureConsumer* raw_input_consumer,
84 GestureEvent* event) override; 84 GestureEvent* event) override;
85 85
86 // Convenience method to find the GestureEventHelper that can dispatch events 86 // Convenience method to find the GestureEventHelper that can dispatch events
87 // to a specific |consumer|. 87 // to a specific |consumer|.
88 GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer); 88 GestureEventHelper* FindDispatchHelperForConsumer(GestureConsumer* consumer);
89 std::map<GestureConsumer*, GestureProviderAura*> consumer_gesture_provider_; 89 std::map<GestureConsumer*, std::unique_ptr<GestureProviderAura>>
90 consumer_gesture_provider_;
90 91
91 // |touch_id_target_| maps a touch-id to its target window. 92 // |touch_id_target_| maps a touch-id to its target window.
92 // touch-ids are removed from |touch_id_target_| on 93 // touch-ids are removed from |touch_id_target_| on
93 // ET_TOUCH_RELEASE and ET_TOUCH_CANCEL. 94 // ET_TOUCH_RELEASE and ET_TOUCH_CANCEL.
94 TouchIdToConsumerMap touch_id_target_; 95 TouchIdToConsumerMap touch_id_target_;
95 96
96 std::vector<GestureEventHelper*> helpers_; 97 std::vector<GestureEventHelper*> helpers_;
97 98
98 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl); 99 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl);
99 }; 100 };
100 101
101 // Provided only for testing: 102 // Provided only for testing:
102 EVENTS_EXPORT void SetGestureRecognizerForTesting( 103 EVENTS_EXPORT void SetGestureRecognizerForTesting(
103 GestureRecognizer* gesture_recognizer); 104 GestureRecognizer* gesture_recognizer);
104 105
105 } // namespace ui 106 } // namespace ui
106 107
107 #endif // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_ 108 #endif // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698