| 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 | 
| 11 #ifndef WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 11 #ifndef WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 
| 12 #define WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 12 #define WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 
| 13 | 13 | 
| 14 #include <memory> | 14 #include <memory> | 
| 15 | 15 | 
| 16 #include "webrtc/api/peerconnectioninterface.h" | 16 #include "webrtc/api/peerconnectioninterface.h" | 
| 17 #include "webrtc/base/constructormagic.h" |  | 
| 18 #include "webrtc/base/messagehandler.h" |  | 
| 19 #include "webrtc/base/rtccertificate.h" |  | 
| 20 #include "webrtc/base/rtccertificategenerator.h" |  | 
| 21 #include "webrtc/p2p/base/transportdescriptionfactory.h" | 17 #include "webrtc/p2p/base/transportdescriptionfactory.h" | 
| 22 #include "webrtc/pc/mediasession.h" | 18 #include "webrtc/pc/mediasession.h" | 
|  | 19 #include "webrtc/rtc_base/constructormagic.h" | 
|  | 20 #include "webrtc/rtc_base/messagehandler.h" | 
|  | 21 #include "webrtc/rtc_base/rtccertificate.h" | 
|  | 22 #include "webrtc/rtc_base/rtccertificategenerator.h" | 
| 23 | 23 | 
| 24 namespace cricket { | 24 namespace cricket { | 
| 25 class ChannelManager; | 25 class ChannelManager; | 
| 26 class TransportDescriptionFactory; | 26 class TransportDescriptionFactory; | 
| 27 }  // namespace cricket | 27 }  // namespace cricket | 
| 28 | 28 | 
| 29 namespace webrtc { | 29 namespace webrtc { | 
| 30 class CreateSessionDescriptionObserver; | 30 class CreateSessionDescriptionObserver; | 
| 31 class MediaConstraintsInterface; | 31 class MediaConstraintsInterface; | 
| 32 class SessionDescriptionInterface; | 32 class SessionDescriptionInterface; | 
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 164   // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. | 164   // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. | 
| 165   WebRtcSession* const session_; | 165   WebRtcSession* const session_; | 
| 166   const std::string session_id_; | 166   const std::string session_id_; | 
| 167   CertificateRequestState certificate_request_state_; | 167   CertificateRequestState certificate_request_state_; | 
| 168 | 168 | 
| 169   RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); | 169   RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); | 
| 170 }; | 170 }; | 
| 171 }  // namespace webrtc | 171 }  // namespace webrtc | 
| 172 | 172 | 
| 173 #endif  // WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 173 #endif  // WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ | 
| OLD | NEW | 
|---|