| OLD | NEW |
| 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 "ui/events/event.h" | 7 #include "ui/events/event.h" |
| 8 #include "ui/events/event_target_iterator.h" | 8 #include "ui/events/event_target_iterator.h" |
| 9 #include "ui/events/event_targeter.h" | 9 #include "ui/events/event_targeter.h" |
| 10 | 10 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 scoped_ptr<TestEventTarget> TestEventTarget::RemoveChild(TestEventTarget *c) { | 31 scoped_ptr<TestEventTarget> TestEventTarget::RemoveChild(TestEventTarget *c) { |
| 32 ScopedVector<TestEventTarget>::iterator iter = std::find(children_.begin(), | 32 ScopedVector<TestEventTarget>::iterator iter = std::find(children_.begin(), |
| 33 children_.end(), | 33 children_.end(), |
| 34 c); | 34 c); |
| 35 if (iter != children_.end()) { | 35 if (iter != children_.end()) { |
| 36 children_.weak_erase(iter); | 36 children_.weak_erase(iter); |
| 37 c->set_parent(NULL); | 37 c->set_parent(NULL); |
| 38 return scoped_ptr<TestEventTarget>(c); | 38 return scoped_ptr<TestEventTarget>(c); |
| 39 } | 39 } |
| 40 return scoped_ptr<TestEventTarget>(); | 40 return nullptr; |
| 41 } | 41 } |
| 42 | 42 |
| 43 void TestEventTarget::SetEventTargeter(scoped_ptr<EventTargeter> targeter) { | 43 void TestEventTarget::SetEventTargeter(scoped_ptr<EventTargeter> targeter) { |
| 44 targeter_ = targeter.Pass(); | 44 targeter_ = targeter.Pass(); |
| 45 } | 45 } |
| 46 | 46 |
| 47 bool TestEventTarget::DidReceiveEvent(ui::EventType type) const { | 47 bool TestEventTarget::DidReceiveEvent(ui::EventType type) const { |
| 48 return received_.count(type) > 0; | 48 return received_.count(type) > 0; |
| 49 } | 49 } |
| 50 | 50 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 // TestEventTarget, private | 85 // TestEventTarget, private |
| 86 | 86 |
| 87 bool TestEventTarget::Contains(TestEventTarget* target) const { | 87 bool TestEventTarget::Contains(TestEventTarget* target) const { |
| 88 while (target && target != this) | 88 while (target && target != this) |
| 89 target = target->parent(); | 89 target = target->parent(); |
| 90 return target == this; | 90 return target == this; |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace test | 93 } // namespace test |
| 94 } // namespace ui | 94 } // namespace ui |
| OLD | NEW |