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

Unified Diff: ui/events/test/test_event_target.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/test/test_event_target.h
diff --git a/ui/events/test/test_event_target.h b/ui/events/test/test_event_target.h
index 3b5311d9e51b31967d4025b226bf3cccfea40113..9e9af656c1037b3fe861d3ef4e9e9f06f39651ad 100644
--- a/ui/events/test/test_event_target.h
+++ b/ui/events/test/test_event_target.h
@@ -7,12 +7,12 @@
#include <stddef.h>
+#include <memory>
#include <set>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_vector.h"
#include "ui/events/event_target.h"
typedef std::vector<std::string> HandlerSequenceRecorder;
@@ -35,7 +35,7 @@ class TestEventTarget : public EventTarget,
mark_events_as_handled_ = handle;
}
- TestEventTarget* child_at(int index) { return children_[index]; }
+ TestEventTarget* child_at(int index) { return children_[index].get(); }
size_t child_count() const { return children_.size(); }
void SetEventTargeter(std::unique_ptr<EventTargeter> targeter);
@@ -68,7 +68,7 @@ class TestEventTarget : public EventTarget,
void set_parent(TestEventTarget* parent) { parent_ = parent; }
TestEventTarget* parent_;
- ScopedVector<TestEventTarget> children_;
+ std::vector<std::unique_ptr<TestEventTarget>> children_;
std::unique_ptr<EventTargeter> targeter_;
bool mark_events_as_handled_;

Powered by Google App Engine
This is Rietveld 408576698