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

Unified Diff: ui/wm/core/capture_controller_unittest.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
« no previous file with comments | « ui/wm/core/accelerator_filter.cc ('k') | ui/wm/core/cursor_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/capture_controller_unittest.cc
diff --git a/ui/wm/core/capture_controller_unittest.cc b/ui/wm/core/capture_controller_unittest.cc
index e3ced50198b4765526470e168fa9efdd24204a11..5129c2fe972f88851970e609d2d4c2243bf5bb56 100644
--- a/ui/wm/core/capture_controller_unittest.cc
+++ b/ui/wm/core/capture_controller_unittest.cc
@@ -4,6 +4,8 @@
#include "ui/wm/core/capture_controller.h"
+#include <utility>
+
#include "base/logging.h"
#include "ui/aura/client/capture_delegate.h"
#include "ui/aura/env.h"
@@ -215,7 +217,9 @@ class GestureEventDeleteWindowOnScrollEnd
public:
GestureEventDeleteWindowOnScrollEnd() {}
- void SetWindow(scoped_ptr<aura::Window> window) { window_ = window.Pass(); }
+ void SetWindow(scoped_ptr<aura::Window> window) {
+ window_ = std::move(window);
+ }
aura::Window* window() { return window_.get(); }
// aura::test::TestWindowDelegate:
@@ -246,7 +250,7 @@ TEST_F(CaptureControllerTest, GestureResetWithCapture) {
bounds.Offset(0, 100);
scoped_ptr<aura::Window> window2(CreateNormalWindowWithBounds(
-1234, root_window(), bounds, delegate.get()));
- delegate->SetWindow(window1.Pass());
+ delegate->SetWindow(std::move(window1));
ui::test::EventGenerator event_generator(root_window());
const int position_x = bounds.x() + 1;
« no previous file with comments | « ui/wm/core/accelerator_filter.cc ('k') | ui/wm/core/cursor_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698