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 |