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

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

Issue 1312643004: Replaces SSLIdentity* with scoped_refptr<RTCCertificate> in cricket::Transport layer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 2012 Google Inc. 3 * Copyright 2012 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 rtc::scoped_refptr<DataChannel> CreateDataChannel( 239 rtc::scoped_refptr<DataChannel> CreateDataChannel(
240 const std::string& label, 240 const std::string& label,
241 const InternalDataChannelInit* config) override; 241 const InternalDataChannelInit* config) override;
242 242
243 cricket::DataChannelType data_channel_type() const; 243 cricket::DataChannelType data_channel_type() const;
244 244
245 bool IceRestartPending() const; 245 bool IceRestartPending() const;
246 246
247 void ResetIceRestartLatch(); 247 void ResetIceRestartLatch();
248 248
249 // Called when an SSLIdentity is generated or retrieved by 249 // Called when an RTCCertificate is generated or retrieved by
250 // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription. 250 // WebRTCSessionDescriptionFactory. Should happen before setLocalDescription.
251 void OnIdentityReady(rtc::SSLIdentity* identity); 251 void OnCertificateReady(
252 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
252 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp); 253 void OnDtlsSetupFailure(cricket::BaseChannel*, bool rtcp);
253 254
254 // For unit test. 255 // For unit test.
255 bool waiting_for_identity_for_testing() const; 256 bool waiting_for_certificate_for_testing() const;
256 257
257 void set_metrics_observer( 258 void set_metrics_observer(
258 webrtc::MetricsObserverInterface* metrics_observer) { 259 webrtc::MetricsObserverInterface* metrics_observer) {
259 metrics_observer_ = metrics_observer; 260 metrics_observer_ = metrics_observer;
260 } 261 }
261 262
262 private: 263 private:
263 // Indicates the type of SessionDescription in a call to SetLocalDescription 264 // Indicates the type of SessionDescription in a call to SetLocalDescription
264 // and SetRemoteDescription. 265 // and SetRemoteDescription.
265 enum Action { 266 enum Action {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 PeerConnectionInterface::BundlePolicy bundle_policy_; 411 PeerConnectionInterface::BundlePolicy bundle_policy_;
411 412
412 // Declares the RTCP mux policy for the WebRTCSession. 413 // Declares the RTCP mux policy for the WebRTCSession.
413 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 414 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
414 415
415 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 416 DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
416 }; 417 };
417 } // namespace webrtc 418 } // namespace webrtc
418 419
419 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 420 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698