diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:32:06 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:32:06 +0000 |
| commit | 375e311d48acc35e8c938ff16280b26ed6ae2c2d (patch) | |
| tree | f8cd724334eba2a552b15bdb388ab1c0d7b12ba6 /net/http | |
| parent | ef8a5fd2185944a7ee04d5e3e05d0fe78800912c (diff) | |
| download | chromium_src-375e311d48acc35e8c938ff16280b26ed6ae2c2d.zip chromium_src-375e311d48acc35e8c938ff16280b26ed6ae2c2d.tar.gz chromium_src-375e311d48acc35e8c938ff16280b26ed6ae2c2d.tar.bz2 | |
Change the proxy waiting-for message to:
"Waiting for proxy tunnel..."
Add a message for waiting for the SSL Handshake to complete:
"Establishing secure connection..."
Also make the waiting messages work for SPDY connections.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2262003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 8a4f486..0ecb180 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -557,11 +557,16 @@ LoadState HttpNetworkTransaction::GetLoadState() const { case STATE_TUNNEL_SEND_REQUEST_COMPLETE: case STATE_TUNNEL_READ_HEADERS_COMPLETE: return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL; + case STATE_SSL_CONNECT_COMPLETE: + return LOAD_STATE_SSL_HANDSHAKE; case STATE_SEND_REQUEST_COMPLETE: + case STATE_SPDY_SEND_REQUEST_COMPLETE: return LOAD_STATE_SENDING_REQUEST; case STATE_READ_HEADERS_COMPLETE: + case STATE_SPDY_READ_HEADERS_COMPLETE: return LOAD_STATE_WAITING_FOR_RESPONSE; case STATE_READ_BODY_COMPLETE: + case STATE_SPDY_READ_BODY_COMPLETE: return LOAD_STATE_READING_RESPONSE; default: return LOAD_STATE_IDLE; |