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

Unified Diff: net/socket/ssl_client_socket_pool.h

Issue 3056040: Revert 54405 - Fix late binding induced mismatch of Socket and AuthController... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | « net/socket/socket_test_util.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.h
===================================================================
--- net/socket/ssl_client_socket_pool.h (revision 54615)
+++ net/socket/ssl_client_socket_pool.h (working copy)
@@ -44,7 +44,7 @@
bool want_spdy_over_npn);
const scoped_refptr<TCPSocketParams>& tcp_params() { return tcp_params_; }
- const scoped_refptr<HttpProxySocketParams>& http_proxy_params() {
+ const scoped_refptr<HttpProxySocketParams>& http_proxy_params () {
return http_proxy_params_;
}
const scoped_refptr<SOCKSSocketParams>& socks_params() {
@@ -114,6 +114,8 @@
// Otherwise, it returns a net error code.
virtual int ConnectInternal();
+ void DetermineFirstState();
+
void OnIOComplete(int result);
// Runs the state transition loop.
Property changes on: net\socket\ssl_client_socket_pool.h
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698