Index: ui/aura/window.cc |
diff --git a/ui/aura/window.cc b/ui/aura/window.cc |
index 0b848e9fb50811cb0055df3b95d22f5ee0bc7a1a..0b405d21f924e19790a56d42193a95fad541da4e 100644 |
--- a/ui/aura/window.cc |
+++ b/ui/aura/window.cc |
@@ -14,6 +14,7 @@ |
#include "base/callback.h" |
#include "base/logging.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
#include "base/strings/stringprintf.h" |
@@ -292,9 +293,9 @@ void Window::SetLayoutManager(LayoutManager* layout_manager) { |
layout_manager_->OnWindowAddedToLayout(*it); |
} |
-scoped_ptr<ui::EventTargeter> |
-Window::SetEventTargeter(scoped_ptr<ui::EventTargeter> targeter) { |
- scoped_ptr<ui::EventTargeter> old_targeter = std::move(targeter_); |
+std::unique_ptr<ui::EventTargeter> Window::SetEventTargeter( |
+ std::unique_ptr<ui::EventTargeter> targeter) { |
+ std::unique_ptr<ui::EventTargeter> old_targeter = std::move(targeter_); |
targeter_ = std::move(targeter); |
return old_targeter; |
} |
@@ -1087,8 +1088,8 @@ ui::EventTarget* Window::GetParentTarget() { |
return parent_; |
} |
-scoped_ptr<ui::EventTargetIterator> Window::GetChildIterator() const { |
- return make_scoped_ptr(new ui::EventTargetIteratorImpl<Window>(children())); |
+std::unique_ptr<ui::EventTargetIterator> Window::GetChildIterator() const { |
+ return base::WrapUnique(new ui::EventTargetIteratorImpl<Window>(children())); |
} |
ui::EventTargeter* Window::GetEventTargeter() { |