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

Unified Diff: remoting/protocol/connection_to_host.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/protocol/connection_to_client.cc ('k') | remoting/protocol/content_description.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/connection_to_host.cc
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 94f33c8f546772e2efe77887140a84651f417f4d..9217202bd42c26f2030b5a5543c5559d5bf1af0a 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -26,11 +26,11 @@ namespace remoting {
namespace protocol {
ConnectionToHost::ConnectionToHost()
- : event_callback_(NULL),
- client_stub_(NULL),
- clipboard_stub_(NULL),
- audio_stub_(NULL),
- signal_strategy_(NULL),
+ : event_callback_(nullptr),
+ client_stub_(nullptr),
+ clipboard_stub_(nullptr),
+ audio_stub_(nullptr),
+ signal_strategy_(nullptr),
state_(INITIALIZING),
error_(OK) {
}
@@ -287,8 +287,8 @@ void ConnectionToHost::CloseOnError(ErrorCode error) {
void ConnectionToHost::CloseChannels() {
control_dispatcher_.reset();
event_dispatcher_.reset();
- clipboard_forwarder_.set_clipboard_stub(NULL);
- event_forwarder_.set_input_stub(NULL);
+ clipboard_forwarder_.set_clipboard_stub(nullptr);
+ event_forwarder_.set_input_stub(nullptr);
video_dispatcher_.reset();
audio_reader_.reset();
}
« no previous file with comments | « remoting/protocol/connection_to_client.cc ('k') | remoting/protocol/content_description.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698