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

Side by Side Diff: webrtc/p2p/base/faketransportcontroller.h

Issue 1337673002: Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@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 * Copyright 2009 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2009 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
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 } 242 }
243 243
244 bool GetSrtpCipher(std::string* cipher) override { 244 bool GetSrtpCipher(std::string* cipher) override {
245 if (!chosen_srtp_cipher_.empty()) { 245 if (!chosen_srtp_cipher_.empty()) {
246 *cipher = chosen_srtp_cipher_; 246 *cipher = chosen_srtp_cipher_;
247 return true; 247 return true;
248 } 248 }
249 return false; 249 return false;
250 } 250 }
251 251
252 bool GetSslCipher(std::string* cipher) override { return false; } 252 bool GetSslCipher(uint16_t* cipher) override { return false; }
253 253
254 rtc::scoped_refptr<rtc::RTCCertificate> GetLocalCertificate() const { 254 rtc::scoped_refptr<rtc::RTCCertificate> GetLocalCertificate() const {
255 return local_cert_; 255 return local_cert_;
256 } 256 }
257 257
258 bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override { 258 bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override {
259 if (!remote_cert_) 259 if (!remote_cert_)
260 return false; 260 return false;
261 261
262 *cert = remote_cert_->GetReference(); 262 *cert = remote_cert_->GetReference();
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 } 528 }
529 } 529 }
530 530
531 private: 531 private:
532 bool fail_create_channel_; 532 bool fail_create_channel_;
533 }; 533 };
534 534
535 } // namespace cricket 535 } // namespace cricket
536 536
537 #endif // WEBRTC_P2P_BASE_FAKETRANSPORTCONTROLLER_H_ 537 #endif // WEBRTC_P2P_BASE_FAKETRANSPORTCONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698