diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 23:08:37 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 23:08:37 +0000 |
| commit | dcbe3df77892fded9f0afa3fe01112f242b6fff7 (patch) | |
| tree | cc4a01616ff566c53df7b4d1c1b821850abcfcdf /chrome/renderer/net | |
| parent | 097782be0628a771d04d49dbb06360b6232cb340 (diff) | |
| download | chromium_src-dcbe3df77892fded9f0afa3fe01112f242b6fff7.zip chromium_src-dcbe3df77892fded9f0afa3fe01112f242b6fff7.tar.gz chromium_src-dcbe3df77892fded9f0afa3fe01112f242b6fff7.tar.bz2 | |
Plumb network stack information about existence of cached copy
through to error page. Specifically, add a "stale_copy_in_cache" argument to all of (ordered from Browser->Renderer):
* ResourceMsg_RequestComplete IPC message.
* ResourceDispatcher::OnRequestComplete
* ResourceLoaderBridge::Peer::OnCompletedRequest.
* All subclasses of RLB::P::OnCompleted Request, including WebURLLoaderImpl::context::OnCompletedRequest.
* Blink WebURLError and ResourceError classes (https://codereview.chromium.org/138493002).
* LocalizedError::GetStrings.
This is a paired commit with the blink CL
https://codereview.chromium.org/138493002. That CL must be landed before this one.
BUG=329620
Review URL: https://codereview.chromium.org/138513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/net')
| -rw-r--r-- | chrome/renderer/net/net_error_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/net/net_error_helper_core.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc index af615f7..7a011b1 100644 --- a/chrome/renderer/net/net_error_helper.cc +++ b/chrome/renderer/net/net_error_helper.cc @@ -126,6 +126,7 @@ void NetErrorHelper::GenerateLocalizedErrorPage(const blink::WebURLError& error, base::DictionaryValue error_strings; LocalizedError::GetStrings(error.reason, error.domain.utf8(), error.unreachableURL, is_failed_post, + error.staleCopyInCache, RenderThread::Get()->GetLocale(), render_frame()->GetRenderView()-> GetAcceptLanguages(), @@ -151,6 +152,7 @@ void NetErrorHelper::UpdateErrorPage(const blink::WebURLError& error, error.domain.utf8(), error.unreachableURL, is_failed_post, + error.staleCopyInCache, RenderThread::Get()->GetLocale(), render_frame()->GetRenderView()-> GetAcceptLanguages(), diff --git a/chrome/renderer/net/net_error_helper_core.cc b/chrome/renderer/net/net_error_helper_core.cc index 55cb771..2501ec18 100644 --- a/chrome/renderer/net/net_error_helper_core.cc +++ b/chrome/renderer/net/net_error_helper_core.cc @@ -313,6 +313,7 @@ blink::WebURLError NetErrorHelperCore::GetUpdatedError( chrome_common_net::kDnsProbeErrorDomain); updated_error.reason = last_probe_status_; updated_error.unreachableURL = error.unreachableURL; + updated_error.staleCopyInCache = error.staleCopyInCache; return updated_error; } |