Chromium Code Reviews| Index: content/child/web_url_loader_impl.cc |
| diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc |
| index b4fe8cc04ae015447231572745759d89c43cf5b8..de046b4c299c6dfae320f17e767460bf2b3c3a3b 100644 |
| --- a/content/child/web_url_loader_impl.cc |
| +++ b/content/child/web_url_loader_impl.cc |
| @@ -531,6 +531,12 @@ void WebURLLoaderImpl::Context::OnReceivedResponse( |
| WebURLResponse response; |
| response.initialize(); |
| + // Updates the request url if the response was feched via a ServiceWorker, |
|
tyoshino (SeeGerritForStatus)
2014/07/08 14:27:49
feched -> fetched
horo
2014/07/09 03:15:01
Done.
|
| + // and it was not generated inside the SherviceWorker. |
|
tyoshino (SeeGerritForStatus)
2014/07/08 14:27:49
Shervice -> Service
horo
2014/07/09 03:15:01
Done.
|
| + if (info.was_fetched_via_service_worker && |
| + !info.original_url_via_service_worker.is_empty()) { |
| + request_.setURL(info.original_url_via_service_worker); |
| + } |
| PopulateURLResponse(request_.url(), info, &response); |
| bool show_raw_listing = (GURL(request_.url()).query() == "raw"); |
| @@ -753,6 +759,7 @@ void WebURLLoaderImpl::PopulateURLResponse(const GURL& url, |
| response->setConnectionID(info.load_timing.socket_log_id); |
| response->setConnectionReused(info.load_timing.socket_reused); |
| response->setDownloadFilePath(info.download_file_path.AsUTF16Unsafe()); |
| + response->setWasFetchedViaServiceWorker(info.was_fetched_via_service_worker); |
| WebURLResponseExtraDataImpl* extra_data = |
| new WebURLResponseExtraDataImpl(info.npn_negotiated_protocol); |
| response->setExtraData(extra_data); |