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

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

Issue 2688943003: Add the URL attribute to cricket::Candiate. (Objc wrapper) (Closed)
Patch Set: Revert unnecessary changes. 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
« no previous file with comments | « webrtc/api/jsep.h ('k') | webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm » ('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 25 matching lines...) Expand all
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 }
45 45
46 virtual std::string server_url() const { return candidate_.url(); }
47
46 virtual bool ToString(std::string* out) const; 48 virtual bool ToString(std::string* out) const;
47 49
48 private: 50 private:
49 std::string sdp_mid_; 51 std::string sdp_mid_;
50 int sdp_mline_index_; 52 int sdp_mline_index_;
51 cricket::Candidate candidate_; 53 cricket::Candidate candidate_;
52 54
53 RTC_DISALLOW_COPY_AND_ASSIGN(JsepIceCandidate); 55 RTC_DISALLOW_COPY_AND_ASSIGN(JsepIceCandidate);
54 }; 56 };
55 57
(...skipping 26 matching lines...) Expand all
82 84
83 private: 85 private:
84 std::vector<JsepIceCandidate*> candidates_; 86 std::vector<JsepIceCandidate*> candidates_;
85 87
86 RTC_DISALLOW_COPY_AND_ASSIGN(JsepCandidateCollection); 88 RTC_DISALLOW_COPY_AND_ASSIGN(JsepCandidateCollection);
87 }; 89 };
88 90
89 } // namespace webrtc 91 } // namespace webrtc
90 92
91 #endif // WEBRTC_API_JSEPICECANDIDATE_H_ 93 #endif // WEBRTC_API_JSEPICECANDIDATE_H_
OLDNEW
« no previous file with comments | « webrtc/api/jsep.h ('k') | webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698