OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 uint64 session_version_; | 190 uint64 session_version_; |
191 const rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_; | 191 const rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_; |
192 const rtc::scoped_refptr<WebRtcIdentityRequestObserver> | 192 const rtc::scoped_refptr<WebRtcIdentityRequestObserver> |
193 identity_request_observer_; | 193 identity_request_observer_; |
194 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. | 194 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. |
195 WebRtcSession* const session_; | 195 WebRtcSession* const session_; |
196 const std::string session_id_; | 196 const std::string session_id_; |
197 const cricket::DataChannelType data_channel_type_; | 197 const cricket::DataChannelType data_channel_type_; |
198 CertificateRequestState certificate_request_state_; | 198 CertificateRequestState certificate_request_state_; |
199 | 199 |
200 DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); | 200 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); |
201 }; | 201 }; |
202 } // namespace webrtc | 202 } // namespace webrtc |
203 | 203 |
204 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 204 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ |
OLD | NEW |