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

Side by Side Diff: webrtc/api/jsepicecandidate.h

Issue 2715103002: Replace NULL with nullptr or null in webrtc/api/. (Closed)
Patch Set: merge with master Created 3 years, 9 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
« no previous file with comments | « webrtc/api/jsep.h ('k') | webrtc/api/jsepsessiondescription.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 13 matching lines...) Expand all
24 24
25 namespace webrtc { 25 namespace webrtc {
26 26
27 // Implementation of IceCandidateInterface. 27 // Implementation of IceCandidateInterface.
28 class JsepIceCandidate : public IceCandidateInterface { 28 class JsepIceCandidate : public IceCandidateInterface {
29 public: 29 public:
30 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index); 30 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index);
31 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index, 31 JsepIceCandidate(const std::string& sdp_mid, int sdp_mline_index,
32 const cricket::Candidate& candidate); 32 const cricket::Candidate& candidate);
33 ~JsepIceCandidate(); 33 ~JsepIceCandidate();
34 // |err| may be NULL. 34 // |err| may be null.
35 bool Initialize(const std::string& sdp, SdpParseError* err); 35 bool Initialize(const std::string& sdp, SdpParseError* err);
36 void SetCandidate(const cricket::Candidate& candidate) { 36 void SetCandidate(const cricket::Candidate& candidate) {
37 candidate_ = candidate; 37 candidate_ = candidate;
38 } 38 }
39 39
40 virtual std::string sdp_mid() const { return sdp_mid_; } 40 virtual std::string sdp_mid() const { return sdp_mid_; }
41 virtual int sdp_mline_index() const { return sdp_mline_index_; } 41 virtual int sdp_mline_index() const { return sdp_mline_index_; }
42 virtual const cricket::Candidate& candidate() const { 42 virtual const cricket::Candidate& candidate() const {
43 return candidate_; 43 return candidate_;
44 } 44 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 private: 85 private:
86 std::vector<JsepIceCandidate*> candidates_; 86 std::vector<JsepIceCandidate*> candidates_;
87 87
88 RTC_DISALLOW_COPY_AND_ASSIGN(JsepCandidateCollection); 88 RTC_DISALLOW_COPY_AND_ASSIGN(JsepCandidateCollection);
89 }; 89 };
90 90
91 } // namespace webrtc 91 } // namespace webrtc
92 92
93 #endif // WEBRTC_API_JSEPICECANDIDATE_H_ 93 #endif // WEBRTC_API_JSEPICECANDIDATE_H_
OLDNEW
« no previous file with comments | « webrtc/api/jsep.h ('k') | webrtc/api/jsepsessiondescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698