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

Unified Diff: remoting/host/basic_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/basic_desktop_environment.cc
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
index f821d593d41818dfaa9252d94880941c2b38a6bf..eb5e9bfea47d9f71d3650f589219ae4f217ee2c0 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -37,7 +37,7 @@ scoped_ptr<InputInjector> BasicDesktopEnvironment::CreateInputInjector() {
scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
- return scoped_ptr<ScreenControls>();
+ return nullptr;
}
scoped_ptr<webrtc::MouseCursorMonitor>
@@ -57,7 +57,7 @@ void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler(
protocol::ClientStub* client_stub) {
- return scoped_ptr<GnubbyAuthHandler>();
+ return nullptr;
}
scoped_ptr<webrtc::DesktopCapturer>

Powered by Google App Engine
This is Rietveld 408576698