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

Side by Side Diff: webrtc/pc/quicdatatransport.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 return false; 49 return false;
50 } 50 }
51 51
52 transport_name_ = transport_name; 52 transport_name_ = transport_name;
53 return true; 53 return true;
54 } 54 }
55 55
56 bool QuicDataTransport::SetTransportChannel( 56 bool QuicDataTransport::SetTransportChannel(
57 cricket::QuicTransportChannel* channel) { 57 cricket::QuicTransportChannel* channel) {
58 if (!channel) { 58 if (!channel) {
59 LOG(LS_ERROR) << "|channel| is NULL. Cannot set transport channel."; 59 LOG(LS_ERROR) << "|channel| is null. Cannot set transport channel.";
60 return false; 60 return false;
61 } 61 }
62 if (quic_transport_channel_) { 62 if (quic_transport_channel_) {
63 if (channel == quic_transport_channel_) { 63 if (channel == quic_transport_channel_) {
64 LOG(LS_WARNING) << "Ignoring duplicate transport channel."; 64 LOG(LS_WARNING) << "Ignoring duplicate transport channel.";
65 return true; 65 return true;
66 } 66 }
67 LOG(LS_ERROR) << "|channel| does not match existing transport channel."; 67 LOG(LS_ERROR) << "|channel| does not match existing transport channel.";
68 return false; 68 return false;
69 } 69 }
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 if (transport_channel) { 188 if (transport_channel) {
189 network_thread_->Invoke<void>( 189 network_thread_->Invoke<void>(
190 RTC_FROM_HERE, 190 RTC_FROM_HERE,
191 rtc::Bind(&cricket::TransportController::DestroyTransportChannel_n, 191 rtc::Bind(&cricket::TransportController::DestroyTransportChannel_n,
192 transport_controller_, transport_channel->transport_name(), 192 transport_controller_, transport_channel->transport_name(),
193 cricket::ICE_CANDIDATE_COMPONENT_DEFAULT)); 193 cricket::ICE_CANDIDATE_COMPONENT_DEFAULT));
194 } 194 }
195 } 195 }
196 196
197 } // namespace webrtc 197 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698