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

Side by Side Diff: net/base/load_states.h

Issue 8373014: Add new text for indicating we are resolving hosts during proxy resolution. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address eroman's nits. Created 9 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_BASE_LOAD_STATES_H__ 5 #ifndef NET_BASE_LOAD_STATES_H__
6 #define NET_BASE_LOAD_STATES_H__ 6 #define NET_BASE_LOAD_STATES_H__
7 #pragma once 7 #pragma once
8 8
9 #include "base/string16.h" 9 #include "base/string16.h"
10 10
(...skipping 22 matching lines...) Expand all
33 // the first completes. This may be done to optimize for cache reuse. 33 // the first completes. This may be done to optimize for cache reuse.
34 LOAD_STATE_WAITING_FOR_CACHE, 34 LOAD_STATE_WAITING_FOR_CACHE,
35 35
36 // This state corresponds to a resource load that is blocked waiting for 36 // This state corresponds to a resource load that is blocked waiting for
37 // access to a resource in the AppCache. 37 // access to a resource in the AppCache.
38 // Note: This is a layering violation, but being the only one it's not that 38 // Note: This is a layering violation, but being the only one it's not that
39 // bad. TODO(rvargas): Reconsider what to do if we need to add more. 39 // bad. TODO(rvargas): Reconsider what to do if we need to add more.
40 LOAD_STATE_WAITING_FOR_APPCACHE, 40 LOAD_STATE_WAITING_FOR_APPCACHE,
41 41
42 // This state corresponds to a resource load that is blocked waiting for a 42 // This state corresponds to a resource load that is blocked waiting for a
43 // proxy autoconfig script to return a proxy server to use. This state may 43 // proxy autoconfig script to return a proxy server to use.
44 // take a while if the proxy script needs to resolve the IP address of the
45 // host before deciding what proxy to use.
46 LOAD_STATE_RESOLVING_PROXY_FOR_URL, 44 LOAD_STATE_RESOLVING_PROXY_FOR_URL,
47 45
46 // This state corresponds to a resource load that is blocked waiting for a
47 // proxy autoconfig script to return a proxy server to use, but that proxy
48 // script is busy resolving the IP address of a host.
49 LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT,
50
48 // This state indicates that we're in the process of establishing a tunnel 51 // This state indicates that we're in the process of establishing a tunnel
49 // through the proxy server. 52 // through the proxy server.
50 LOAD_STATE_ESTABLISHING_PROXY_TUNNEL, 53 LOAD_STATE_ESTABLISHING_PROXY_TUNNEL,
51 54
52 // This state corresponds to a resource load that is blocked waiting for a 55 // This state corresponds to a resource load that is blocked waiting for a
53 // host name to be resolved. This could either indicate resolution of the 56 // host name to be resolved. This could either indicate resolution of the
54 // origin server corresponding to the resource or to the host name of a proxy 57 // origin server corresponding to the resource or to the host name of a proxy
55 // server used to fetch the resource. 58 // server used to fetch the resource.
56 LOAD_STATE_RESOLVING_HOST, 59 LOAD_STATE_RESOLVING_HOST,
57 60
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 LoadState state; 94 LoadState state;
92 string16 param; 95 string16 param;
93 LoadStateWithParam() : state(LOAD_STATE_IDLE) {} 96 LoadStateWithParam() : state(LOAD_STATE_IDLE) {}
94 LoadStateWithParam(LoadState state, const string16& param) 97 LoadStateWithParam(LoadState state, const string16& param)
95 : state(state), param(param) {} 98 : state(state), param(param) {}
96 }; 99 };
97 100
98 } // namespace net 101 } // namespace net
99 102
100 #endif // NET_BASE_LOAD_STATES_H__ 103 #endif // NET_BASE_LOAD_STATES_H__
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents_wrapper.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698