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

Unified Diff: remoting/host/desktop_process.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « remoting/host/desktop_environment.h ('k') | remoting/host/desktop_process_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_process.cc
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc
index 5f0303e02303b2dfe8e3fd4f50f1020502ce7350..4d282d13f963ff550d8d381892dd3653e3737698 100644
--- a/remoting/host/desktop_process.cc
+++ b/remoting/host/desktop_process.cc
@@ -81,11 +81,11 @@ void DesktopProcess::OnChannelError() {
daemon_channel_.reset();
if (desktop_agent_.get()) {
desktop_agent_->Stop();
- desktop_agent_ = NULL;
+ desktop_agent_ = nullptr;
}
- caller_task_runner_ = NULL;
- input_task_runner_ = NULL;
+ caller_task_runner_ = nullptr;
+ input_task_runner_ = nullptr;
desktop_environment_factory_.reset();
}
@@ -131,9 +131,9 @@ bool DesktopProcess::Start(
// Start the agent and create an IPC channel to talk to it.
IPC::PlatformFileForTransit desktop_pipe;
if (!desktop_agent_->Start(AsWeakPtr(), &desktop_pipe)) {
- desktop_agent_ = NULL;
- caller_task_runner_ = NULL;
- input_task_runner_ = NULL;
+ desktop_agent_ = nullptr;
+ caller_task_runner_ = nullptr;
+ input_task_runner_ = nullptr;
desktop_environment_factory_.reset();
return false;
}
« no previous file with comments | « remoting/host/desktop_environment.h ('k') | remoting/host/desktop_process_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698