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

Unified Diff: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
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_;
}
« no previous file with comments | « ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc ('k') | ui/views/window/dialog_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698