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

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

Issue 2628393003: Remove ScopedVector from ui/events/. (Closed)
Patch Set: chromeos2 Created 3 years, 11 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: ui/events/gestures/gesture_provider_aura.h
diff --git a/ui/events/gestures/gesture_provider_aura.h b/ui/events/gestures/gesture_provider_aura.h
index c0e397b31c80cf5ba001fae380c8827ca1a4fff9..4fa90ac22c63f1ddfd03eb490d7299ebea91c43f 100644
--- a/ui/events/gestures/gesture_provider_aura.h
+++ b/ui/events/gestures/gesture_provider_aura.h
@@ -7,8 +7,10 @@
#include <stdint.h>
+#include <memory>
+#include <vector>
+
#include "base/macros.h"
-#include "base/memory/scoped_vector.h"
#include "ui/events/event.h"
#include "ui/events/events_export.h"
#include "ui/events/gesture_detection/filtered_gesture_provider.h"
@@ -42,7 +44,7 @@ class EVENTS_EXPORT GestureProviderAura : public GestureProviderClient {
bool OnTouchEvent(TouchEvent* event);
void OnTouchEventAck(uint32_t unique_touch_event_id, bool event_consumed);
const MotionEventAura& pointer_state() { return pointer_state_; }
- ScopedVector<GestureEvent>* GetAndResetPendingGestures();
+ std::vector<std::unique_ptr<GestureEvent>> GetAndResetPendingGestures();
void OnTouchEnter(int pointer_id, float x, float y);
// GestureProviderClient implementation
@@ -54,7 +56,7 @@ class EVENTS_EXPORT GestureProviderAura : public GestureProviderClient {
FilteredGestureProvider filtered_gesture_provider_;
bool handling_event_;
- ScopedVector<GestureEvent> pending_gestures_;
+ std::vector<std::unique_ptr<GestureEvent>> pending_gestures_;
// |gesture_consumer_| must outlive this object.
GestureConsumer* gesture_consumer_;

Powered by Google App Engine
This is Rietveld 408576698