Index: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc |
diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc |
index de39a04867757a01fd19152f4ff88ca869212c50..1f432caf021d58bc48c5f8c307ec63b049f343c2 100644 |
--- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc |
+++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc |
@@ -4,8 +4,9 @@ |
#include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" |
-#include <X11/keysym.h> |
#include <X11/Xlib.h> |
+#include <X11/keysym.h> |
+#include <utility> |
#include "base/bind.h" |
#include "base/message_loop/message_loop.h" |
@@ -156,7 +157,7 @@ bool X11WholeScreenMoveLoop::RunMoveLoop(aura::Window* source, |
GrabEscKey(); |
scoped_ptr<ui::ScopedEventDispatcher> old_dispatcher = |
- nested_dispatcher_.Pass(); |
+ std::move(nested_dispatcher_); |
nested_dispatcher_ = |
ui::PlatformEventSource::GetInstance()->OverrideDispatcher(this); |
@@ -182,7 +183,7 @@ bool X11WholeScreenMoveLoop::RunMoveLoop(aura::Window* source, |
if (!alive) |
return false; |
- nested_dispatcher_ = old_dispatcher.Pass(); |
+ nested_dispatcher_ = std::move(old_dispatcher); |
return !canceled_; |
} |