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

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

Issue 1717583002: Non-constraint interfaces for all constrainable interfaces (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix an ambiguous function Created 4 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 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 static void CopyCandidatesFromSessionDescription( 99 static void CopyCandidatesFromSessionDescription(
100 const SessionDescriptionInterface* source_desc, 100 const SessionDescriptionInterface* source_desc,
101 SessionDescriptionInterface* dest_desc); 101 SessionDescriptionInterface* dest_desc);
102 102
103 void CreateOffer( 103 void CreateOffer(
104 CreateSessionDescriptionObserver* observer, 104 CreateSessionDescriptionObserver* observer,
105 const PeerConnectionInterface::RTCOfferAnswerOptions& options, 105 const PeerConnectionInterface::RTCOfferAnswerOptions& options,
106 const cricket::MediaSessionOptions& session_options); 106 const cricket::MediaSessionOptions& session_options);
107 void CreateAnswer(CreateSessionDescriptionObserver* observer, 107 void CreateAnswer(CreateSessionDescriptionObserver* observer,
108 const MediaConstraintsInterface* constraints,
109 const cricket::MediaSessionOptions& session_options); 108 const cricket::MediaSessionOptions& session_options);
110 109
111 void SetSdesPolicy(cricket::SecurePolicy secure_policy); 110 void SetSdesPolicy(cricket::SecurePolicy secure_policy);
112 cricket::SecurePolicy SdesPolicy() const; 111 cricket::SecurePolicy SdesPolicy() const;
113 112
114 sigslot::signal1<const rtc::scoped_refptr<rtc::RTCCertificate>&> 113 sigslot::signal1<const rtc::scoped_refptr<rtc::RTCCertificate>&>
115 SignalCertificateReady; 114 SignalCertificateReady;
116 115
117 // For testing. 116 // For testing.
118 bool waiting_for_certificate_for_testing() const { 117 bool waiting_for_certificate_for_testing() const {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. 166 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed.
168 WebRtcSession* const session_; 167 WebRtcSession* const session_;
169 const std::string session_id_; 168 const std::string session_id_;
170 CertificateRequestState certificate_request_state_; 169 CertificateRequestState certificate_request_state_;
171 170
172 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); 171 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory);
173 }; 172 };
174 } // namespace webrtc 173 } // namespace webrtc
175 174
176 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ 175 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698