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

Unified Diff: remoting/host/single_window_desktop_environment.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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: 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 7950b8a93d7fd4554492b21da7802f1d6f521e87..acb2c01525f7863831a6d793209d1165ae8a3999 100644
--- a/remoting/host/single_window_desktop_environment.cc
+++ b/remoting/host/single_window_desktop_environment.cc
@@ -51,7 +51,7 @@ SingleWindowDesktopEnvironment::CreateVideoCapturer() {
webrtc::WindowCapturer::Create(options));
window_capturer->SelectWindow(window_id_);
- return window_capturer.PassAs<webrtc::DesktopCapturer>();
+ return window_capturer.Pass();
}
scoped_ptr<InputInjector>
@@ -62,7 +62,7 @@ SingleWindowDesktopEnvironment::CreateInputInjector() {
InputInjector::Create(input_task_runner(),
ui_task_runner()));
return SingleWindowInputInjector::CreateForWindow(
- window_id_, input_injector.Pass()).PassAs<InputInjector>();
+ window_id_, input_injector.Pass()).Pass();
}
SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment(
@@ -100,7 +100,7 @@ scoped_ptr<DesktopEnvironment> SingleWindowDesktopEnvironmentFactory::Create(
input_task_runner(),
ui_task_runner(),
window_id_));
- return desktop_environment.PassAs<DesktopEnvironment>();
+ return desktop_environment.Pass();
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698