Index: ui/wm/core/nested_accelerator_controller.cc |
diff --git a/ui/wm/core/nested_accelerator_controller.cc b/ui/wm/core/nested_accelerator_controller.cc |
index e4ace4f777ad42177cdd89605133622ec5e91f98..42ace4e9617d997eb3faf8af6e2d80a6de88622c 100644 |
--- a/ui/wm/core/nested_accelerator_controller.cc |
+++ b/ui/wm/core/nested_accelerator_controller.cc |
@@ -4,6 +4,8 @@ |
#include "ui/wm/core/nested_accelerator_controller.h" |
+#include <utility> |
+ |
#include "base/auto_reset.h" |
#include "base/bind.h" |
#include "base/run_loop.h" |
@@ -26,7 +28,7 @@ void NestedAcceleratorController::PrepareNestedLoopClosures( |
base::Closure* run_closure, |
base::Closure* quit_closure) { |
scoped_ptr<NestedAcceleratorDispatcher> old_accelerator_dispatcher = |
- accelerator_dispatcher_.Pass(); |
+ std::move(accelerator_dispatcher_); |
accelerator_dispatcher_ = NestedAcceleratorDispatcher::Create( |
dispatcher_delegate_.get(), nested_dispatcher); |
@@ -45,7 +47,7 @@ void NestedAcceleratorController::RunNestedMessageLoop( |
scoped_ptr<base::RunLoop> run_loop, |
scoped_ptr<NestedAcceleratorDispatcher> old_accelerator_dispatcher) { |
run_loop->Run(); |
- accelerator_dispatcher_ = old_accelerator_dispatcher.Pass(); |
+ accelerator_dispatcher_ = std::move(old_accelerator_dispatcher); |
} |
void NestedAcceleratorController::QuitNestedMessageLoop( |