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

Side by Side Diff: ui/events/test/test_event_target.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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
« no previous file with comments | « ui/events/test/test_event_processor.cc ('k') | ui/events/test/test_event_target.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <set> 10 #include <set>
(...skipping 12 matching lines...) Expand all
23 23
24 namespace ui { 24 namespace ui {
25 namespace test { 25 namespace test {
26 26
27 class TestEventTarget : public EventTarget, 27 class TestEventTarget : public EventTarget,
28 public EventHandler { 28 public EventHandler {
29 public: 29 public:
30 TestEventTarget(); 30 TestEventTarget();
31 ~TestEventTarget() override; 31 ~TestEventTarget() override;
32 32
33 void AddChild(scoped_ptr<TestEventTarget> child); 33 void AddChild(std::unique_ptr<TestEventTarget> child);
34 scoped_ptr<TestEventTarget> RemoveChild(TestEventTarget* child); 34 std::unique_ptr<TestEventTarget> RemoveChild(TestEventTarget* child);
35 35
36 TestEventTarget* parent() { return parent_; } 36 TestEventTarget* parent() { return parent_; }
37 37
38 void set_mark_events_as_handled(bool handle) { 38 void set_mark_events_as_handled(bool handle) {
39 mark_events_as_handled_ = handle; 39 mark_events_as_handled_ = handle;
40 } 40 }
41 41
42 TestEventTarget* child_at(int index) { return children_[index]; } 42 TestEventTarget* child_at(int index) { return children_[index]; }
43 size_t child_count() const { return children_.size(); } 43 size_t child_count() const { return children_.size(); }
44 44
45 void SetEventTargeter(scoped_ptr<EventTargeter> targeter); 45 void SetEventTargeter(std::unique_ptr<EventTargeter> targeter);
46 46
47 bool DidReceiveEvent(ui::EventType type) const; 47 bool DidReceiveEvent(ui::EventType type) const;
48 void ResetReceivedEvents(); 48 void ResetReceivedEvents();
49 49
50 void set_recorder(HandlerSequenceRecorder* recorder) { 50 void set_recorder(HandlerSequenceRecorder* recorder) {
51 recorder_ = recorder; 51 recorder_ = recorder;
52 } 52 }
53 void set_target_name(const std::string& target_name) { 53 void set_target_name(const std::string& target_name) {
54 target_name_ = target_name; 54 target_name_ = target_name;
55 } 55 }
56 56
57 // EventTarget: 57 // EventTarget:
58 EventTargeter* GetEventTargeter() override; 58 EventTargeter* GetEventTargeter() override;
59 59
60 protected: 60 protected:
61 bool Contains(TestEventTarget* target) const; 61 bool Contains(TestEventTarget* target) const;
62 62
63 // EventTarget: 63 // EventTarget:
64 bool CanAcceptEvent(const ui::Event& event) override; 64 bool CanAcceptEvent(const ui::Event& event) override;
65 EventTarget* GetParentTarget() override; 65 EventTarget* GetParentTarget() override;
66 scoped_ptr<EventTargetIterator> GetChildIterator() const override; 66 std::unique_ptr<EventTargetIterator> GetChildIterator() const override;
67 67
68 // EventHandler: 68 // EventHandler:
69 void OnEvent(Event* event) override; 69 void OnEvent(Event* event) override;
70 70
71 private: 71 private:
72 void set_parent(TestEventTarget* parent) { parent_ = parent; } 72 void set_parent(TestEventTarget* parent) { parent_ = parent; }
73 73
74 TestEventTarget* parent_; 74 TestEventTarget* parent_;
75 ScopedVector<TestEventTarget> children_; 75 ScopedVector<TestEventTarget> children_;
76 scoped_ptr<EventTargeter> targeter_; 76 std::unique_ptr<EventTargeter> targeter_;
77 bool mark_events_as_handled_; 77 bool mark_events_as_handled_;
78 78
79 std::set<ui::EventType> received_; 79 std::set<ui::EventType> received_;
80 80
81 HandlerSequenceRecorder* recorder_; 81 HandlerSequenceRecorder* recorder_;
82 std::string target_name_; 82 std::string target_name_;
83 83
84 DISALLOW_COPY_AND_ASSIGN(TestEventTarget); 84 DISALLOW_COPY_AND_ASSIGN(TestEventTarget);
85 }; 85 };
86 86
87 } // namespace test 87 } // namespace test
88 } // namespace ui 88 } // namespace ui
89 89
90 #endif // UI_EVENTS_TEST_TEST_EVENT_TARGET_H_ 90 #endif // UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
OLDNEW
« no previous file with comments | « ui/events/test/test_event_processor.cc ('k') | ui/events/test/test_event_target.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698