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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TEST_TEST_EVENT_TARGET_H_ 5 #ifndef UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
6 #define UI_EVENTS_TEST_TEST_EVENT_TARGET_H_ 6 #define UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
10 #include <set> 11 #include <set>
11 #include <string> 12 #include <string>
12 #include <vector> 13 #include <vector>
13 14
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_vector.h"
16 #include "ui/events/event_target.h" 16 #include "ui/events/event_target.h"
17 17
18 typedef std::vector<std::string> HandlerSequenceRecorder; 18 typedef std::vector<std::string> HandlerSequenceRecorder;
19 19
20 namespace ui { 20 namespace ui {
21 namespace test { 21 namespace test {
22 22
23 class TestEventTarget : public EventTarget, 23 class TestEventTarget : public EventTarget,
24 public EventHandler { 24 public EventHandler {
25 public: 25 public:
26 TestEventTarget(); 26 TestEventTarget();
27 ~TestEventTarget() override; 27 ~TestEventTarget() override;
28 28
29 void AddChild(std::unique_ptr<TestEventTarget> child); 29 void AddChild(std::unique_ptr<TestEventTarget> child);
30 std::unique_ptr<TestEventTarget> RemoveChild(TestEventTarget* child); 30 std::unique_ptr<TestEventTarget> RemoveChild(TestEventTarget* child);
31 31
32 TestEventTarget* parent() { return parent_; } 32 TestEventTarget* parent() { return parent_; }
33 33
34 void set_mark_events_as_handled(bool handle) { 34 void set_mark_events_as_handled(bool handle) {
35 mark_events_as_handled_ = handle; 35 mark_events_as_handled_ = handle;
36 } 36 }
37 37
38 TestEventTarget* child_at(int index) { return children_[index]; } 38 TestEventTarget* child_at(int index) { return children_[index].get(); }
39 size_t child_count() const { return children_.size(); } 39 size_t child_count() const { return children_.size(); }
40 40
41 void SetEventTargeter(std::unique_ptr<EventTargeter> targeter); 41 void SetEventTargeter(std::unique_ptr<EventTargeter> targeter);
42 42
43 bool DidReceiveEvent(ui::EventType type) const; 43 bool DidReceiveEvent(ui::EventType type) const;
44 void ResetReceivedEvents(); 44 void ResetReceivedEvents();
45 45
46 void set_recorder(HandlerSequenceRecorder* recorder) { 46 void set_recorder(HandlerSequenceRecorder* recorder) {
47 recorder_ = recorder; 47 recorder_ = recorder;
48 } 48 }
(...skipping 12 matching lines...) Expand all
61 EventTarget* GetParentTarget() override; 61 EventTarget* GetParentTarget() override;
62 std::unique_ptr<EventTargetIterator> GetChildIterator() const override; 62 std::unique_ptr<EventTargetIterator> GetChildIterator() const override;
63 63
64 // EventHandler: 64 // EventHandler:
65 void OnEvent(Event* event) override; 65 void OnEvent(Event* event) override;
66 66
67 private: 67 private:
68 void set_parent(TestEventTarget* parent) { parent_ = parent; } 68 void set_parent(TestEventTarget* parent) { parent_ = parent; }
69 69
70 TestEventTarget* parent_; 70 TestEventTarget* parent_;
71 ScopedVector<TestEventTarget> children_; 71 std::vector<std::unique_ptr<TestEventTarget>> children_;
72 std::unique_ptr<EventTargeter> targeter_; 72 std::unique_ptr<EventTargeter> targeter_;
73 bool mark_events_as_handled_; 73 bool mark_events_as_handled_;
74 74
75 std::set<ui::EventType> received_; 75 std::set<ui::EventType> received_;
76 76
77 HandlerSequenceRecorder* recorder_; 77 HandlerSequenceRecorder* recorder_;
78 std::string target_name_; 78 std::string target_name_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(TestEventTarget); 80 DISALLOW_COPY_AND_ASSIGN(TestEventTarget);
81 }; 81 };
82 82
83 } // namespace test 83 } // namespace test
84 } // namespace ui 84 } // namespace ui
85 85
86 #endif // UI_EVENTS_TEST_TEST_EVENT_TARGET_H_ 86 #endif // UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698