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

Unified Diff: remoting/host/desktop_session_win.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/desktop_session_win.cc
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
index 6005b301c6c05b50274057502e9138dbda3a88f6..b1477836e157a6f011bb9e8ac7e9eb379f12bfa1 100644
--- a/remoting/host/desktop_session_win.cc
+++ b/remoting/host/desktop_session_win.cc
@@ -375,7 +375,7 @@ scoped_ptr<DesktopSession> DesktopSessionWin::CreateForConsole(
caller_task_runner, io_task_runner, daemon_process, id,
HostService::GetInstance()));
- return session.PassAs<DesktopSession>();
+ return session.Pass();
}
// static
@@ -389,9 +389,9 @@ scoped_ptr<DesktopSession> DesktopSessionWin::CreateForVirtualTerminal(
caller_task_runner, io_task_runner, daemon_process, id,
HostService::GetInstance()));
if (!session->Initialize(resolution))
- return scoped_ptr<DesktopSession>();
+ return nullptr;
- return session.PassAs<DesktopSession>();
+ return session.Pass();
}
DesktopSessionWin::DesktopSessionWin(
@@ -552,8 +552,7 @@ void DesktopSessionWin::OnSessionAttached(uint32 session_id) {
}
// Create a launcher for the desktop process, using the per-session delegate.
- launcher_.reset(new WorkerProcessLauncher(
- delegate.PassAs<WorkerProcessLauncher::Delegate>(), this));
+ launcher_.reset(new WorkerProcessLauncher(delegate.Pass(), this));
}
void DesktopSessionWin::OnSessionDetached() {

Powered by Google App Engine
This is Rietveld 408576698