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

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

Issue 1186083002: Ability to specify KeyType (RSA, ECDSA) in CreatePeerConnection (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: PeerConnectionFactoryInterface::CreatePeerConnection without KeyType Created 5 years, 6 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // request has completed, i.e. when OnIdentityRequestFailed or OnIdentityReady 85 // request has completed, i.e. when OnIdentityRequestFailed or OnIdentityReady
86 // is called. 86 // is called.
87 class WebRtcSessionDescriptionFactory : public rtc::MessageHandler, 87 class WebRtcSessionDescriptionFactory : public rtc::MessageHandler,
88 public sigslot::has_slots<> { 88 public sigslot::has_slots<> {
89 public: 89 public:
90 WebRtcSessionDescriptionFactory( 90 WebRtcSessionDescriptionFactory(
91 rtc::Thread* signaling_thread, 91 rtc::Thread* signaling_thread,
92 cricket::ChannelManager* channel_manager, 92 cricket::ChannelManager* channel_manager,
93 MediaStreamSignaling* mediastream_signaling, 93 MediaStreamSignaling* mediastream_signaling,
94 DTLSIdentityServiceInterface* dtls_identity_service, 94 DTLSIdentityServiceInterface* dtls_identity_service,
95 rtc::KeyType key_type,
95 // TODO(jiayl): remove the dependency on session once b/10226852 is fixed. 96 // TODO(jiayl): remove the dependency on session once b/10226852 is fixed.
96 WebRtcSession* session, 97 WebRtcSession* session,
97 const std::string& session_id, 98 const std::string& session_id,
98 cricket::DataChannelType dct, 99 cricket::DataChannelType dct,
99 bool dtls_enabled); 100 bool dtls_enabled);
100 virtual ~WebRtcSessionDescriptionFactory(); 101 virtual ~WebRtcSessionDescriptionFactory();
101 102
102 static void CopyCandidatesFromSessionDescription( 103 static void CopyCandidatesFromSessionDescription(
103 const SessionDescriptionInterface* source_desc, 104 const SessionDescriptionInterface* source_desc,
104 SessionDescriptionInterface* dest_desc); 105 SessionDescriptionInterface* dest_desc);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 WebRtcSession* session_; 157 WebRtcSession* session_;
157 std::string session_id_; 158 std::string session_id_;
158 cricket::DataChannelType data_channel_type_; 159 cricket::DataChannelType data_channel_type_;
159 IdentityRequestState identity_request_state_; 160 IdentityRequestState identity_request_state_;
160 161
161 DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); 162 DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory);
162 }; 163 };
163 } // namespace webrtc 164 } // namespace webrtc
164 165
165 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ 166 #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