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

Unified Diff: webrtc/p2p/base/transportchannelproxy.h

Issue 1304043008: Replacing SSLIdentity* with scoped_refptr<RTCCertificate> in TransportChannel layer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Making overriding "virtual" methods use the override keyword 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/base/transportchannelimpl.h ('k') | webrtc/p2p/base/transportchannelproxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/transportchannelproxy.h
diff --git a/webrtc/p2p/base/transportchannelproxy.h b/webrtc/p2p/base/transportchannelproxy.h
index 3a69bccb4c0a818f9b4a654624a05e58e86efb6c..3d55d10694ffff10e190724c6b19ca155510bf92 100644
--- a/webrtc/p2p/base/transportchannelproxy.h
+++ b/webrtc/p2p/base/transportchannelproxy.h
@@ -35,39 +35,39 @@ class TransportChannelProxy : public TransportChannel,
public:
TransportChannelProxy(const std::string& content_name,
int component);
- virtual ~TransportChannelProxy();
+ ~TransportChannelProxy() override;
TransportChannelImpl* impl() { return impl_; }
- virtual TransportChannelState GetState() const;
+ TransportChannelState GetState() const override;
// Sets the implementation to which we will proxy.
void SetImplementation(TransportChannelImpl* impl);
// Implementation of the TransportChannel interface. These simply forward to
// the implementation.
- virtual int SendPacket(const char* data, size_t len,
- const rtc::PacketOptions& options,
- int flags);
- virtual int SetOption(rtc::Socket::Option opt, int value);
- virtual bool GetOption(rtc::Socket::Option opt, int* value);
- virtual int GetError();
+ int SendPacket(const char* data, size_t len,
+ const rtc::PacketOptions& options,
+ int flags) override;
+ int SetOption(rtc::Socket::Option opt, int value) override;
+ bool GetOption(rtc::Socket::Option opt, int* value) override;
+ int GetError() override;
virtual IceRole GetIceRole() const;
- virtual bool GetStats(ConnectionInfos* infos);
- virtual bool IsDtlsActive() const;
- virtual bool GetSslRole(rtc::SSLRole* role) const;
+ bool GetStats(ConnectionInfos* infos) override;
+ bool IsDtlsActive() const override;
+ bool GetSslRole(rtc::SSLRole* role) const override;
virtual bool SetSslRole(rtc::SSLRole role);
- virtual bool SetSrtpCiphers(const std::vector<std::string>& ciphers);
- virtual bool GetSrtpCipher(std::string* cipher);
- virtual bool GetSslCipher(std::string* cipher);
- virtual bool GetLocalIdentity(rtc::SSLIdentity** identity) const;
- virtual bool GetRemoteCertificate(rtc::SSLCertificate** cert) const;
- virtual bool ExportKeyingMaterial(const std::string& label,
+ bool SetSrtpCiphers(const std::vector<std::string>& ciphers) override;
+ bool GetSrtpCipher(std::string* cipher) override;
+ bool GetSslCipher(std::string* cipher) override;
+ rtc::scoped_refptr<rtc::RTCCertificate> GetLocalCertificate() const override;
+ bool GetRemoteSSLCertificate(rtc::SSLCertificate** cert) const override;
+ bool ExportKeyingMaterial(const std::string& label,
const uint8* context,
size_t context_len,
bool use_context,
uint8* result,
- size_t result_len);
+ size_t result_len) override;
private:
// Catch signals from the implementation channel. These just forward to the
« no previous file with comments | « webrtc/p2p/base/transportchannelimpl.h ('k') | webrtc/p2p/base/transportchannelproxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698