| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 WebRtcSessionDescriptionFactory(rtc::Thread* signaling_thread, | 78 WebRtcSessionDescriptionFactory(rtc::Thread* signaling_thread, |
| 79 cricket::ChannelManager* channel_manager, | 79 cricket::ChannelManager* channel_manager, |
| 80 WebRtcSession* session, | 80 WebRtcSession* session, |
| 81 const std::string& session_id); | 81 const std::string& session_id); |
| 82 | 82 |
| 83 // Construct with DTLS enabled using the specified |dtls_identity_store| to | 83 // Construct with DTLS enabled using the specified |dtls_identity_store| to |
| 84 // generate a certificate. | 84 // generate a certificate. |
| 85 WebRtcSessionDescriptionFactory( | 85 WebRtcSessionDescriptionFactory( |
| 86 rtc::Thread* signaling_thread, | 86 rtc::Thread* signaling_thread, |
| 87 cricket::ChannelManager* channel_manager, | 87 cricket::ChannelManager* channel_manager, |
| 88 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, | 88 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
| 89 WebRtcSession* session, | 89 WebRtcSession* session, |
| 90 const std::string& session_id); | 90 const std::string& session_id); |
| 91 | 91 |
| 92 // Construct with DTLS enabled using the specified (already generated) | 92 // Construct with DTLS enabled using the specified (already generated) |
| 93 // |certificate|. | 93 // |certificate|. |
| 94 WebRtcSessionDescriptionFactory( | 94 WebRtcSessionDescriptionFactory( |
| 95 rtc::Thread* signaling_thread, | 95 rtc::Thread* signaling_thread, |
| 96 cricket::ChannelManager* channel_manager, | 96 cricket::ChannelManager* channel_manager, |
| 97 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate, | 97 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate, |
| 98 WebRtcSession* session, | 98 WebRtcSession* session, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 126 enum CertificateRequestState { | 126 enum CertificateRequestState { |
| 127 CERTIFICATE_NOT_NEEDED, | 127 CERTIFICATE_NOT_NEEDED, |
| 128 CERTIFICATE_WAITING, | 128 CERTIFICATE_WAITING, |
| 129 CERTIFICATE_SUCCEEDED, | 129 CERTIFICATE_SUCCEEDED, |
| 130 CERTIFICATE_FAILED, | 130 CERTIFICATE_FAILED, |
| 131 }; | 131 }; |
| 132 | 132 |
| 133 WebRtcSessionDescriptionFactory( | 133 WebRtcSessionDescriptionFactory( |
| 134 rtc::Thread* signaling_thread, | 134 rtc::Thread* signaling_thread, |
| 135 cricket::ChannelManager* channel_manager, | 135 cricket::ChannelManager* channel_manager, |
| 136 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, | 136 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
| 137 const rtc::scoped_refptr<WebRtcIdentityRequestObserver>& | 137 const rtc::scoped_refptr<WebRtcIdentityRequestObserver>& |
| 138 identity_request_observer, | 138 identity_request_observer, |
| 139 WebRtcSession* session, | 139 WebRtcSession* session, |
| 140 const std::string& session_id, | 140 const std::string& session_id, |
| 141 bool dtls_enabled); | 141 bool dtls_enabled); |
| 142 | 142 |
| 143 // MessageHandler implementation. | 143 // MessageHandler implementation. |
| 144 virtual void OnMessage(rtc::Message* msg); | 144 virtual void OnMessage(rtc::Message* msg); |
| 145 | 145 |
| 146 void InternalCreateOffer(CreateSessionDescriptionRequest request); | 146 void InternalCreateOffer(CreateSessionDescriptionRequest request); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 157 void OnIdentityRequestFailed(int error); | 157 void OnIdentityRequestFailed(int error); |
| 158 void SetCertificate( | 158 void SetCertificate( |
| 159 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate); | 159 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate); |
| 160 | 160 |
| 161 std::queue<CreateSessionDescriptionRequest> | 161 std::queue<CreateSessionDescriptionRequest> |
| 162 create_session_description_requests_; | 162 create_session_description_requests_; |
| 163 rtc::Thread* const signaling_thread_; | 163 rtc::Thread* const signaling_thread_; |
| 164 cricket::TransportDescriptionFactory transport_desc_factory_; | 164 cricket::TransportDescriptionFactory transport_desc_factory_; |
| 165 cricket::MediaSessionDescriptionFactory session_desc_factory_; | 165 cricket::MediaSessionDescriptionFactory session_desc_factory_; |
| 166 uint64_t session_version_; | 166 uint64_t session_version_; |
| 167 const rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_; | 167 const std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store_; |
| 168 const rtc::scoped_refptr<WebRtcIdentityRequestObserver> | 168 const rtc::scoped_refptr<WebRtcIdentityRequestObserver> |
| 169 identity_request_observer_; | 169 identity_request_observer_; |
| 170 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. | 170 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. |
| 171 WebRtcSession* const session_; | 171 WebRtcSession* const session_; |
| 172 const std::string session_id_; | 172 const std::string session_id_; |
| 173 CertificateRequestState certificate_request_state_; | 173 CertificateRequestState certificate_request_state_; |
| 174 | 174 |
| 175 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); | 175 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); |
| 176 }; | 176 }; |
| 177 } // namespace webrtc | 177 } // namespace webrtc |
| 178 | 178 |
| 179 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 179 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ |
| OLD | NEW |