| OLD | NEW |
| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 static void CopyCandidatesFromSessionDescription( | 99 static void CopyCandidatesFromSessionDescription( |
| 100 const SessionDescriptionInterface* source_desc, | 100 const SessionDescriptionInterface* source_desc, |
| 101 const std::string& content_name, | 101 const std::string& content_name, |
| 102 SessionDescriptionInterface* dest_desc); | 102 SessionDescriptionInterface* dest_desc); |
| 103 | 103 |
| 104 void CreateOffer( | 104 void CreateOffer( |
| 105 CreateSessionDescriptionObserver* observer, | 105 CreateSessionDescriptionObserver* observer, |
| 106 const PeerConnectionInterface::RTCOfferAnswerOptions& options, | 106 const PeerConnectionInterface::RTCOfferAnswerOptions& options, |
| 107 const cricket::MediaSessionOptions& session_options); | 107 const cricket::MediaSessionOptions& session_options); |
| 108 void CreateAnswer(CreateSessionDescriptionObserver* observer, | 108 void CreateAnswer(CreateSessionDescriptionObserver* observer, |
| 109 const MediaConstraintsInterface* constraints, | |
| 110 const cricket::MediaSessionOptions& session_options); | 109 const cricket::MediaSessionOptions& session_options); |
| 111 | 110 |
| 112 void SetSdesPolicy(cricket::SecurePolicy secure_policy); | 111 void SetSdesPolicy(cricket::SecurePolicy secure_policy); |
| 113 cricket::SecurePolicy SdesPolicy() const; | 112 cricket::SecurePolicy SdesPolicy() const; |
| 114 | 113 |
| 115 sigslot::signal1<const rtc::scoped_refptr<rtc::RTCCertificate>&> | 114 sigslot::signal1<const rtc::scoped_refptr<rtc::RTCCertificate>&> |
| 116 SignalCertificateReady; | 115 SignalCertificateReady; |
| 117 | 116 |
| 118 // For testing. | 117 // For testing. |
| 119 bool waiting_for_certificate_for_testing() const { | 118 bool waiting_for_certificate_for_testing() const { |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. | 167 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. |
| 169 WebRtcSession* const session_; | 168 WebRtcSession* const session_; |
| 170 const std::string session_id_; | 169 const std::string session_id_; |
| 171 CertificateRequestState certificate_request_state_; | 170 CertificateRequestState certificate_request_state_; |
| 172 | 171 |
| 173 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); | 172 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); |
| 174 }; | 173 }; |
| 175 } // namespace webrtc | 174 } // namespace webrtc |
| 176 | 175 |
| 177 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 176 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ |
| OLD | NEW |