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

Unified Diff: remoting/host/single_window_desktop_environment.cc

Issue 1549493004: Use std::move() instead of .Pass() in remoting/host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass
Patch Set: include <utility> 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 | « remoting/host/signaling_connector.cc ('k') | remoting/host/single_window_input_injector_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/single_window_desktop_environment.cc
diff --git a/remoting/host/single_window_desktop_environment.cc b/remoting/host/single_window_desktop_environment.cc
index 2fe54571cfd9d69cfb1d39fb369519ba48b60a8b..d120932cdb537cf4ed1aae7f9a788e0732cef194 100644
--- a/remoting/host/single_window_desktop_environment.cc
+++ b/remoting/host/single_window_desktop_environment.cc
@@ -4,6 +4,8 @@
#include "remoting/host/single_window_desktop_environment.h"
+#include <utility>
+
#include "base/logging.h"
#include "base/macros.h"
#include "base/single_thread_task_runner.h"
@@ -38,8 +40,7 @@ class SingleWindowDesktopEnvironment : public BasicDesktopEnvironment {
DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment);
};
-SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() {
-}
+SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() {}
scoped_ptr<webrtc::DesktopCapturer>
SingleWindowDesktopEnvironment::CreateVideoCapturer() {
@@ -49,11 +50,11 @@ SingleWindowDesktopEnvironment::CreateVideoCapturer() {
webrtc::DesktopCaptureOptions::CreateDefault();
options.set_use_update_notifications(true);
- scoped_ptr<webrtc::WindowCapturer>window_capturer(
+ scoped_ptr<webrtc::WindowCapturer> window_capturer(
webrtc::WindowCapturer::Create(options));
window_capturer->SelectWindow(window_id_);
- return window_capturer.Pass();
+ return std::move(window_capturer);
}
scoped_ptr<InputInjector>
@@ -64,7 +65,7 @@ SingleWindowDesktopEnvironment::CreateInputInjector() {
InputInjector::Create(input_task_runner(),
ui_task_runner()));
return SingleWindowInputInjector::CreateForWindow(
- window_id_, input_injector.Pass()).Pass();
+ window_id_, std::move(input_injector));
}
SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment(
@@ -105,7 +106,7 @@ scoped_ptr<DesktopEnvironment> SingleWindowDesktopEnvironmentFactory::Create(
ui_task_runner(),
window_id_,
supports_touch_events()));
- return desktop_environment.Pass();
+ return std::move(desktop_environment);
}
} // namespace remoting
« no previous file with comments | « remoting/host/signaling_connector.cc ('k') | remoting/host/single_window_input_injector_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698