Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: talk/app/webrtc/webrtcsessiondescriptionfactory.h

Issue 1358413003: Revert of TransportController refactoring. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 // This class is used to create offer/answer session description with regards to 84 // This class is used to create offer/answer session description with regards to
85 // the async DTLS identity generation for WebRtcSession. 85 // the async DTLS identity generation for WebRtcSession.
86 // It queues the create offer/answer request until the DTLS identity 86 // It queues the create offer/answer request until the DTLS identity
87 // request has completed, i.e. when OnIdentityRequestFailed or OnIdentityReady 87 // request has completed, i.e. when OnIdentityRequestFailed or OnIdentityReady
88 // is called. 88 // is called.
89 class WebRtcSessionDescriptionFactory : public rtc::MessageHandler, 89 class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
90 public sigslot::has_slots<> { 90 public sigslot::has_slots<> {
91 public: 91 public:
92 // Construct with DTLS disabled. 92 // Construct with DTLS disabled.
93 WebRtcSessionDescriptionFactory(rtc::Thread* signaling_thread, 93 WebRtcSessionDescriptionFactory(
94 cricket::ChannelManager* channel_manager, 94 rtc::Thread* signaling_thread,
95 MediaStreamSignaling* mediastream_signaling, 95 cricket::ChannelManager* channel_manager,
96 WebRtcSession* session, 96 MediaStreamSignaling* mediastream_signaling,
97 const std::string& session_id, 97 WebRtcSession* session,
98 cricket::DataChannelType dct); 98 const std::string& session_id,
99 cricket::DataChannelType dct);
99 100
100 // Construct with DTLS enabled using the specified |dtls_identity_store| to 101 // Construct with DTLS enabled using the specified |dtls_identity_store| to
101 // generate a certificate. 102 // generate a certificate.
102 WebRtcSessionDescriptionFactory( 103 WebRtcSessionDescriptionFactory(
103 rtc::Thread* signaling_thread, 104 rtc::Thread* signaling_thread,
104 cricket::ChannelManager* channel_manager, 105 cricket::ChannelManager* channel_manager,
105 MediaStreamSignaling* mediastream_signaling, 106 MediaStreamSignaling* mediastream_signaling,
106 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 107 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
107 WebRtcSession* session, 108 WebRtcSession* session,
108 const std::string& session_id, 109 const std::string& session_id,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 WebRtcSession* const session_; 195 WebRtcSession* const session_;
195 const std::string session_id_; 196 const std::string session_id_;
196 const cricket::DataChannelType data_channel_type_; 197 const cricket::DataChannelType data_channel_type_;
197 CertificateRequestState certificate_request_state_; 198 CertificateRequestState certificate_request_state_;
198 199
199 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); 200 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory);
200 }; 201 };
201 } // namespace webrtc 202 } // namespace webrtc
202 203
203 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ 204 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/app/webrtc/webrtcsessiondescriptionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698