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

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

Issue 2259753003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/event_generator.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> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 bool TestEventTarget::CanAcceptEvent(const ui::Event& event) { 65 bool TestEventTarget::CanAcceptEvent(const ui::Event& event) {
66 return true; 66 return true;
67 } 67 }
68 68
69 EventTarget* TestEventTarget::GetParentTarget() { 69 EventTarget* TestEventTarget::GetParentTarget() {
70 return parent_; 70 return parent_;
71 } 71 }
72 72
73 std::unique_ptr<EventTargetIterator> TestEventTarget::GetChildIterator() const { 73 std::unique_ptr<EventTargetIterator> TestEventTarget::GetChildIterator() const {
74 return base::WrapUnique( 74 return base::MakeUnique<EventTargetIteratorImpl<TestEventTarget>>(
75 new EventTargetIteratorImpl<TestEventTarget>(children_.get())); 75 children_.get());
76 } 76 }
77 77
78 EventTargeter* TestEventTarget::GetEventTargeter() { 78 EventTargeter* TestEventTarget::GetEventTargeter() {
79 return targeter_.get(); 79 return targeter_.get();
80 } 80 }
81 81
82 void TestEventTarget::OnEvent(Event* event) { 82 void TestEventTarget::OnEvent(Event* event) {
83 if (recorder_) 83 if (recorder_)
84 recorder_->push_back(target_name_); 84 recorder_->push_back(target_name_);
85 received_.insert(event->type()); 85 received_.insert(event->type());
86 EventHandler::OnEvent(event); 86 EventHandler::OnEvent(event);
87 if (!event->handled() && mark_events_as_handled_) 87 if (!event->handled() && mark_events_as_handled_)
88 event->SetHandled(); 88 event->SetHandled();
89 } 89 }
90 90
91 //////////////////////////////////////////////////////////////////////////////// 91 ////////////////////////////////////////////////////////////////////////////////
92 // TestEventTarget, private 92 // TestEventTarget, private
93 93
94 bool TestEventTarget::Contains(TestEventTarget* target) const { 94 bool TestEventTarget::Contains(TestEventTarget* target) const {
95 while (target && target != this) 95 while (target && target != this)
96 target = target->parent(); 96 target = target->parent();
97 return target == this; 97 return target == this;
98 } 98 }
99 99
100 } // namespace test 100 } // namespace test
101 } // namespace ui 101 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/test/event_generator.cc ('k') | ui/events/x/events_x_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698