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

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

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/x/events_x_unittest.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 #include "ui/events/test/test_event_target.h" 5 #include "ui/events/test/test_event_target.h"
6 6
7 #include <utility>
8
7 #include "ui/events/event.h" 9 #include "ui/events/event.h"
8 #include "ui/events/event_target_iterator.h" 10 #include "ui/events/event_target_iterator.h"
9 #include "ui/events/event_targeter.h" 11 #include "ui/events/event_targeter.h"
10 12
11 namespace ui { 13 namespace ui {
12 namespace test { 14 namespace test {
13 15
14 TestEventTarget::TestEventTarget() 16 TestEventTarget::TestEventTarget()
15 : parent_(NULL), 17 : parent_(NULL),
16 mark_events_as_handled_(false), 18 mark_events_as_handled_(false),
17 recorder_(NULL), 19 recorder_(NULL),
18 target_name_("unknown") { 20 target_name_("unknown") {
19 SetTargetHandler(this); 21 SetTargetHandler(this);
20 } 22 }
21 TestEventTarget::~TestEventTarget() {} 23 TestEventTarget::~TestEventTarget() {}
22 24
23 void TestEventTarget::AddChild(scoped_ptr<TestEventTarget> child) { 25 void TestEventTarget::AddChild(scoped_ptr<TestEventTarget> child) {
24 TestEventTarget* child_r = child.get(); 26 TestEventTarget* child_r = child.get();
25 if (child->parent()) { 27 if (child->parent()) {
26 AddChild(child->parent()->RemoveChild(child.release())); 28 AddChild(child->parent()->RemoveChild(child.release()));
27 } else { 29 } else {
28 children_.push_back(child.Pass()); 30 children_.push_back(std::move(child));
29 } 31 }
30 child_r->set_parent(this); 32 child_r->set_parent(this);
31 } 33 }
32 34
33 scoped_ptr<TestEventTarget> TestEventTarget::RemoveChild(TestEventTarget *c) { 35 scoped_ptr<TestEventTarget> TestEventTarget::RemoveChild(TestEventTarget *c) {
34 ScopedVector<TestEventTarget>::iterator iter = std::find(children_.begin(), 36 ScopedVector<TestEventTarget>::iterator iter = std::find(children_.begin(),
35 children_.end(), 37 children_.end(),
36 c); 38 c);
37 if (iter != children_.end()) { 39 if (iter != children_.end()) {
38 children_.weak_erase(iter); 40 children_.weak_erase(iter);
39 c->set_parent(NULL); 41 c->set_parent(NULL);
40 return make_scoped_ptr(c); 42 return make_scoped_ptr(c);
41 } 43 }
42 return nullptr; 44 return nullptr;
43 } 45 }
44 46
45 void TestEventTarget::SetEventTargeter(scoped_ptr<EventTargeter> targeter) { 47 void TestEventTarget::SetEventTargeter(scoped_ptr<EventTargeter> targeter) {
46 targeter_ = targeter.Pass(); 48 targeter_ = std::move(targeter);
47 } 49 }
48 50
49 bool TestEventTarget::DidReceiveEvent(ui::EventType type) const { 51 bool TestEventTarget::DidReceiveEvent(ui::EventType type) const {
50 return received_.count(type) > 0; 52 return received_.count(type) > 0;
51 } 53 }
52 54
53 void TestEventTarget::ResetReceivedEvents() { 55 void TestEventTarget::ResetReceivedEvents() {
54 received_.clear(); 56 received_.clear();
55 } 57 }
56 58
(...skipping 30 matching lines...) Expand all
87 // TestEventTarget, private 89 // TestEventTarget, private
88 90
89 bool TestEventTarget::Contains(TestEventTarget* target) const { 91 bool TestEventTarget::Contains(TestEventTarget* target) const {
90 while (target && target != this) 92 while (target && target != this)
91 target = target->parent(); 93 target = target->parent();
92 return target == this; 94 return target == this;
93 } 95 }
94 96
95 } // namespace test 97 } // namespace test
96 } // namespace ui 98 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/test/test_event_processor.cc ('k') | ui/events/x/events_x_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698