diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 01:48:12 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 01:48:12 +0000 |
| commit | 8ee611b9f801ca79266312cc672079c110418ac6 (patch) | |
| tree | 446ba6d6ad9d30c3d34ca18df43a3a0f125da106 /net/quic/quic_client_session.h | |
| parent | 9e5e242b661330481ceabb2f8eba5f0778e2516d (diff) | |
| download | chromium_src-8ee611b9f801ca79266312cc672079c110418ac6.zip chromium_src-8ee611b9f801ca79266312cc672079c110418ac6.tar.gz chromium_src-8ee611b9f801ca79266312cc672079c110418ac6.tar.bz2 | |
Add an OnCryptoHandshakeComplete method to QuicSession.
Rename QuicSession::IsHandshakeComplete() to IsCryptoHandshakeComplete().
Rename QuicCryptoStream::set_handshake_complete to SetHandshakeComplete and add a QuicErrorCode parameter and call QuicSession::OnCryptoHandshakeComplete()
Merge internal change: 38897855
Review URL: https://chromiumcodereview.appspot.com/11280040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_client_session.h')
| -rw-r--r-- | net/quic/quic_client_session.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h index 08e6c65..11d3121 100644 --- a/net/quic/quic_client_session.h +++ b/net/quic/quic_client_session.h @@ -7,6 +7,7 @@ #ifndef NET_QUIC_QUIC_CLIENT_SESSION_H_ #define NET_QUIC_QUIC_CLIENT_SESSION_H_ +#include "net/base/completion_callback.h" #include "net/quic/quic_crypto_client_stream.h" #include "net/quic/quic_reliable_client_stream.h" #include "net/quic/quic_session.h" @@ -22,9 +23,10 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicSession { // QuicSession methods: virtual QuicReliableClientStream* CreateOutgoingReliableStream() OVERRIDE; virtual QuicCryptoClientStream* GetCryptoStream() OVERRIDE; + virtual void OnCryptoHandshakeComplete(QuicErrorCode error) OVERRIDE; // Perform a crypto handshake with the server. - void CryptoConnect(); + int CryptoConnect(const CompletionCallback& callback); protected: // QuicSession methods: @@ -34,6 +36,8 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicSession { private: QuicCryptoClientStream crypto_stream_; + CompletionCallback callback_; + DISALLOW_COPY_AND_ASSIGN(QuicClientSession); }; |