diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc | 2 | ||||
| -rw-r--r-- | net/base/load_states.h | 6 | ||||
| -rw-r--r-- | webkit/appcache/appcache_url_request_job.cc | 4 |
4 files changed, 13 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 1d980d8..a98c45b 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6478,6 +6478,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_LOAD_STATE_WAITING_FOR_CACHE"> Waiting for cache... </message> + <message name="IDS_LOAD_STATE_WAITING_FOR_APPCACHE"> + Waiting for AppCache... + </message> <message name="IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL"> Waiting for proxy tunnel... </message> diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc index 8d95117..0452e39 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc @@ -481,6 +481,8 @@ string16 TabContentsWrapper::GetStatusText() const { tab_contents()->load_state().param); case net::LOAD_STATE_WAITING_FOR_CACHE: return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_CACHE); + case net::LOAD_STATE_WAITING_FOR_APPCACHE: + return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_APPCACHE); case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL: return l10n_util::GetStringUTF16(IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL); diff --git a/net/base/load_states.h b/net/base/load_states.h index 91b0b6b..b5ca6a8 100644 --- a/net/base/load_states.h +++ b/net/base/load_states.h @@ -33,6 +33,12 @@ enum LoadState { // the first completes. This may be done to optimize for cache reuse. LOAD_STATE_WAITING_FOR_CACHE, + // This state corresponds to a resource load that is blocked waiting for + // access to a resource in the AppCache. + // Note: This is a layering violation, but being the only one it's not that + // bad. TODO(rvargas): Reconsider what to do if we need to add more. + 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 diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc index 5c31256..2d9b828 100644 --- a/webkit/appcache/appcache_url_request_job.cc +++ b/webkit/appcache/appcache_url_request_job.cc @@ -228,11 +228,11 @@ net::LoadState AppCacheURLRequestJob::GetLoadState() const { if (!has_been_started()) return net::LOAD_STATE_IDLE; if (!has_delivery_orders()) - return net::LOAD_STATE_WAITING_FOR_CACHE; + return net::LOAD_STATE_WAITING_FOR_APPCACHE; if (delivery_type_ != APPCACHED_DELIVERY) return net::LOAD_STATE_IDLE; if (!info_.get()) - return net::LOAD_STATE_WAITING_FOR_CACHE; + return net::LOAD_STATE_WAITING_FOR_APPCACHE; if (reader_.get() && reader_->IsReadPending()) return net::LOAD_STATE_READING_RESPONSE; return net::LOAD_STATE_IDLE; |