Index: ui/aura/scoped_window_targeter.cc |
diff --git a/ui/aura/scoped_window_targeter.cc b/ui/aura/scoped_window_targeter.cc |
index d71e9193df9bf39f8cb6f08ad1b26e5ba3ca9eb2..ae7c06bc669595002fce654b91e95b2a82390c08 100644 |
--- a/ui/aura/scoped_window_targeter.cc |
+++ b/ui/aura/scoped_window_targeter.cc |
@@ -4,6 +4,8 @@ |
#include "ui/aura/scoped_window_targeter.h" |
+#include <utility> |
+ |
#include "ui/aura/window.h" |
namespace aura { |
@@ -12,14 +14,14 @@ ScopedWindowTargeter::ScopedWindowTargeter( |
Window* window, |
scoped_ptr<ui::EventTargeter> new_targeter) |
: window_(window), |
- old_targeter_(window->SetEventTargeter(new_targeter.Pass())) { |
+ old_targeter_(window->SetEventTargeter(std::move(new_targeter))) { |
window_->AddObserver(this); |
} |
ScopedWindowTargeter::~ScopedWindowTargeter() { |
if (window_) { |
window_->RemoveObserver(this); |
- window_->SetEventTargeter(old_targeter_.Pass()); |
+ window_->SetEventTargeter(std::move(old_targeter_)); |
} |
} |