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

Unified Diff: remoting/host/me2me_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/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index e6f5fdca93de8465c7fd6840f4d53d3bbe4febdf..de92383c83c06bc77b8940763741fb2472748395 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -65,7 +65,7 @@ scoped_ptr<GnubbyAuthHandler> Me2MeDesktopEnvironment::CreateGnubbyAuthHandler(
GnubbyAuthHandler::Create(client_stub));
HOST_LOG << "gnubby auth is not enabled";
- return scoped_ptr<GnubbyAuthHandler>();
+ return nullptr;
}
bool Me2MeDesktopEnvironment::InitializeSecurity(
@@ -148,11 +148,11 @@ scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
ui_task_runner()));
if (!desktop_environment->InitializeSecurity(client_session_control,
curtain_enabled_)) {
- return scoped_ptr<DesktopEnvironment>();
+ return nullptr;
}
desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_);
- return desktop_environment.PassAs<DesktopEnvironment>();
+ return desktop_environment.Pass();
}
void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {

Powered by Google App Engine
This is Rietveld 408576698