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

Unified Diff: remoting/protocol/channel_multiplexer.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/channel_multiplexer.h ('k') | remoting/protocol/channel_multiplexer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_multiplexer.cc
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index abeb7b217c19bf3b3edf74caec0030bd65040a3f..62bb9d2902931d9b5e9b4baeb23699351e34146b 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -191,7 +191,7 @@ ChannelMultiplexer::MuxChannel::MuxChannel(
send_id_(send_id),
id_sent_(false),
receive_id_(kChannelIdUnknown),
- socket_(NULL) {
+ socket_(nullptr) {
}
ChannelMultiplexer::MuxChannel::~MuxChannel() {
@@ -227,7 +227,7 @@ void ChannelMultiplexer::MuxChannel::OnWriteFailed() {
void ChannelMultiplexer::MuxChannel::OnSocketDestroyed() {
DCHECK(socket_);
- socket_ = NULL;
+ socket_ = nullptr;
}
bool ChannelMultiplexer::MuxChannel::DoWrite(
@@ -335,7 +335,7 @@ void ChannelMultiplexer::MuxSocket::OnWriteFailed() {
void ChannelMultiplexer::MuxSocket::OnPacketReceived() {
if (!read_callback_.is_null()) {
int result = channel_->DoRead(read_buffer_.get(), read_buffer_size_);
- read_buffer_ = NULL;
+ read_buffer_ = nullptr;
DCHECK_GT(result, 0);
net::CompletionCallback cb;
std::swap(cb, read_callback_);
@@ -395,7 +395,7 @@ void ChannelMultiplexer::CancelChannelCreation(const std::string& name) {
void ChannelMultiplexer::OnBaseChannelReady(
scoped_ptr<net::StreamSocket> socket) {
- base_channel_factory_ = NULL;
+ base_channel_factory_ = nullptr;
base_channel_ = socket.Pass();
if (base_channel_.get()) {
@@ -472,7 +472,7 @@ void ChannelMultiplexer::OnIncomingPacket(scoped_ptr<MultiplexPacket> packet,
}
int receive_id = packet->channel_id();
- MuxChannel* channel = NULL;
+ MuxChannel* channel = nullptr;
std::map<int, MuxChannel*>::iterator it =
channels_by_receive_id_.find(receive_id);
if (it != channels_by_receive_id_.end()) {
« no previous file with comments | « remoting/protocol/channel_multiplexer.h ('k') | remoting/protocol/channel_multiplexer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698