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

Side by Side Diff: webrtc/api/jsepsessiondescription.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/jsepicecandidate.h ('k') | webrtc/api/mediastreaminterface.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 17 matching lines...) Expand all
28 } 28 }
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 // Implementation of SessionDescriptionInterface. 32 // Implementation of SessionDescriptionInterface.
33 class JsepSessionDescription : public SessionDescriptionInterface { 33 class JsepSessionDescription : public SessionDescriptionInterface {
34 public: 34 public:
35 explicit JsepSessionDescription(const std::string& type); 35 explicit JsepSessionDescription(const std::string& type);
36 virtual ~JsepSessionDescription(); 36 virtual ~JsepSessionDescription();
37 37
38 // |error| may be NULL. 38 // |error| may be null.
39 bool Initialize(const std::string& sdp, SdpParseError* error); 39 bool Initialize(const std::string& sdp, SdpParseError* error);
40 40
41 // Takes ownership of |description|. 41 // Takes ownership of |description|.
42 // TODO(deadbeef): Make this use an std::unique_ptr<>, so ownership logic is 42 // TODO(deadbeef): Make this use an std::unique_ptr<>, so ownership logic is
43 // more clear. 43 // more clear.
44 bool Initialize(cricket::SessionDescription* description, 44 bool Initialize(cricket::SessionDescription* description,
45 const std::string& session_id, 45 const std::string& session_id,
46 const std::string& session_version); 46 const std::string& session_version);
47 47
48 virtual cricket::SessionDescription* description() { 48 virtual cricket::SessionDescription* description() {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 bool GetMediasectionIndex(const IceCandidateInterface* candidate, 83 bool GetMediasectionIndex(const IceCandidateInterface* candidate,
84 size_t* index); 84 size_t* index);
85 int GetMediasectionIndex(const cricket::Candidate& candidate); 85 int GetMediasectionIndex(const cricket::Candidate& candidate);
86 86
87 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); 87 RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription);
88 }; 88 };
89 89
90 } // namespace webrtc 90 } // namespace webrtc
91 91
92 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_ 92 #endif // WEBRTC_API_JSEPSESSIONDESCRIPTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/jsepicecandidate.h ('k') | webrtc/api/mediastreaminterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698