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

Unified Diff: net/socket_stream/socket_stream.h

Issue 7484065: secure proxy support in websocket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | « no previous file | net/socket_stream/socket_stream.cc » ('j') | net/socket_stream/socket_stream.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket_stream/socket_stream.h
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 19331f453eafeb36b8f8651027ff2d0cd4268aa0..5e5b33955ca78672ac9c5ce85bfdd02116f46d6d 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -228,6 +228,8 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> {
STATE_READ_TUNNEL_HEADERS_COMPLETE,
STATE_SOCKS_CONNECT,
STATE_SOCKS_CONNECT_COMPLETE,
+ STATE_SECURE_PROXY_CONNECT,
+ STATE_SECURE_PROXY_CONNECT_COMPLETE,
STATE_SSL_CONNECT,
STATE_SSL_CONNECT_COMPLETE,
STATE_READ_WRITE,
@@ -255,6 +257,7 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> {
// notifications will be sent to delegate.
void Finish(int result);
+ int DidEstablishSSL(int result);
int DidEstablishConnection();
int DidReceiveData(int result);
int DidSendData(int result);
@@ -279,6 +282,8 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> {
int DoReadTunnelHeadersComplete(int result);
int DoSOCKSConnect();
int DoSOCKSConnectComplete(int result);
+ int DoSecureProxyConnect();
+ int DoSecureProxyConnectComplete(int result);
int DoSSLConnect();
int DoSSLConnectComplete(int result);
int DoReadWrite(int result);
« no previous file with comments | « no previous file | net/socket_stream/socket_stream.cc » ('j') | net/socket_stream/socket_stream.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698