| 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 13 matching lines...) Expand all Loading... |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 28 #ifndef TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ |
| 29 #define TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 29 #define TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ |
| 30 | 30 |
| 31 #include "talk/app/webrtc/dtlsidentitystore.h" | 31 #include "talk/app/webrtc/dtlsidentitystore.h" |
| 32 #include "talk/app/webrtc/peerconnectioninterface.h" | 32 #include "talk/app/webrtc/peerconnectioninterface.h" |
| 33 #include "talk/session/media/mediasession.h" | 33 #include "talk/session/media/mediasession.h" |
| 34 #include "webrtc/p2p/base/transportdescriptionfactory.h" | |
| 35 #include "webrtc/base/messagehandler.h" | 34 #include "webrtc/base/messagehandler.h" |
| 36 #include "webrtc/base/rtccertificate.h" | 35 #include "webrtc/base/rtccertificate.h" |
| 36 #include "webrtc/p2p/base/transportdescriptionfactory.h" |
| 37 | 37 |
| 38 namespace cricket { | 38 namespace cricket { |
| 39 class ChannelManager; | 39 class ChannelManager; |
| 40 class TransportDescriptionFactory; | 40 class TransportDescriptionFactory; |
| 41 } // namespace cricket | 41 } // namespace cricket |
| 42 | 42 |
| 43 namespace webrtc { | 43 namespace webrtc { |
| 44 class CreateSessionDescriptionObserver; | 44 class CreateSessionDescriptionObserver; |
| 45 class MediaConstraintsInterface; | 45 class MediaConstraintsInterface; |
| 46 class SessionDescriptionInterface; | 46 class SessionDescriptionInterface; |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. | 184 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. |
| 185 WebRtcSession* const session_; | 185 WebRtcSession* const session_; |
| 186 const std::string session_id_; | 186 const std::string session_id_; |
| 187 CertificateRequestState certificate_request_state_; | 187 CertificateRequestState certificate_request_state_; |
| 188 | 188 |
| 189 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); | 189 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); |
| 190 }; | 190 }; |
| 191 } // namespace webrtc | 191 } // namespace webrtc |
| 192 | 192 |
| 193 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 193 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ |
| OLD | NEW |