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

Unified Diff: ash/display/mirror_window_controller.cc

Issue 1547223002: Convert Pass()→std::move() in //ash (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 | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/display/mouse_cursor_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 7daadcef9a8f2887ded0a07b02317b65111ddc15..df5717438c47d26829f300773bb591d903e44920 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -4,6 +4,8 @@
#include "ash/display/mirror_window_controller.h"
+#include <utility>
+
#if defined(USE_X11)
#include <X11/Xlib.h>
#include <X11/extensions/XInput2.h>
@@ -226,7 +228,7 @@ void MirrorWindowController::UpdateWindow(
new aura::Window(nullptr);
mirror_window->Init(ui::LAYER_SOLID_COLOR);
host->window()->AddChild(mirror_window);
- host_info->ash_host->SetRootWindowTransformer(transformer.Pass());
+ host_info->ash_host->SetRootWindowTransformer(std::move(transformer));
mirror_window->SetBounds(host->window()->bounds());
mirror_window->Show();
if (reflector_) {
@@ -242,7 +244,7 @@ void MirrorWindowController::UpdateWindow(
mirroring_host_info_map_[display_info.id()]->ash_host.get();
aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
GetRootWindowSettings(host->window())->display_id = display_info.id();
- ash_host->SetRootWindowTransformer(transformer.Pass());
+ ash_host->SetRootWindowTransformer(std::move(transformer));
host->SetBounds(display_info.bounds_in_native());
}
}
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/display/mouse_cursor_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698