summaryrefslogtreecommitdiffstats
path: root/net/base/load_states.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 00:33:17 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 00:33:17 +0000
commitf2c971f82ea27b15c674e1f9cbf3513b92636e86 (patch)
treea534dca72436f71195f1578200f0eb456b39f50d /net/base/load_states.h
parenteb191d643e576ccba8b51179c6fdf751f92eb21a (diff)
downloadchromium_src-f2c971f82ea27b15c674e1f9cbf3513b92636e86.zip
chromium_src-f2c971f82ea27b15c674e1f9cbf3513b92636e86.tar.gz
chromium_src-f2c971f82ea27b15c674e1f9cbf3513b92636e86.tar.bz2
Add new text for indicating we are resolving hosts during proxy resolution.
Required adding a new GetLoadStateThreadSafe() virtual method to the ProxyResolver interface. ProxyResolverV8 uses this. BUG=59308 TEST=none Review URL: http://codereview.chromium.org/8373014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/load_states.h')
-rw-r--r--net/base/load_states.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/base/load_states.h b/net/base/load_states.h
index b5ca6a8..97d6855 100644
--- a/net/base/load_states.h
+++ b/net/base/load_states.h
@@ -40,11 +40,14 @@ enum LoadState {
LOAD_STATE_WAITING_FOR_APPCACHE,
// This state corresponds to a resource load that is blocked waiting for a
- // proxy autoconfig script to return a proxy server to use. This state may
- // take a while if the proxy script needs to resolve the IP address of the
- // host before deciding what proxy to use.
+ // proxy autoconfig script to return a proxy server to use.
LOAD_STATE_RESOLVING_PROXY_FOR_URL,
+ // This state corresponds to a resource load that is blocked waiting for a
+ // proxy autoconfig script to return a proxy server to use, but that proxy
+ // script is busy resolving the IP address of a host.
+ LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT,
+
// This state indicates that we're in the process of establishing a tunnel
// through the proxy server.
LOAD_STATE_ESTABLISHING_PROXY_TUNNEL,