diff options
Diffstat (limited to 'content/browser/loader')
-rw-r--r-- | content/browser/loader/cross_site_resource_handler.cc | 4 | ||||
-rw-r--r-- | content/browser/loader/resource_dispatcher_host_impl.cc | 8 | ||||
-rw-r--r-- | content/browser/loader/resource_loader.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc index 344d93e..8e56397 100644 --- a/content/browser/loader/cross_site_resource_handler.cc +++ b/content/browser/loader/cross_site_resource_handler.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "content/browser/appcache/appcache_interceptor.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/cross_site_request_manager.h" #include "content/browser/frame_host/cross_site_transferring_request.h" @@ -25,7 +26,6 @@ #include "content/public/common/url_constants.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" -#include "webkit/browser/appcache/appcache_interceptor.h" namespace content { @@ -308,7 +308,7 @@ void CrossSiteResourceHandler::StartCrossSiteTransition( transfer_url_chain = request()->url_chain(); referrer = Referrer(GURL(request()->referrer()), info->GetReferrerPolicy()); - appcache::AppCacheInterceptor::PrepareForCrossSiteTransfer( + AppCacheInterceptor::PrepareForCrossSiteTransfer( request(), global_id.child_id); ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(global_id); } diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 9234315..61fc35b 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -23,6 +23,7 @@ #include "base/metrics/sparse_histogram.h" #include "base/stl_util.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" +#include "content/browser/appcache/appcache_interceptor.h" #include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/cert_store_impl.h" #include "content/browser/child_process_security_policy_impl.h" @@ -87,7 +88,6 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" -#include "webkit/browser/appcache/appcache_interceptor.h" #include "webkit/common/blob/blob_data.h" #include "webkit/browser/blob/blob_data_handle.h" #include "webkit/browser/blob/blob_storage_context.h" @@ -797,7 +797,7 @@ void ResourceDispatcherHostImpl::DidFinishLoading(ResourceLoader* loader) { void ResourceDispatcherHostImpl::OnInit() { scheduler_.reset(new ResourceScheduler); - appcache::AppCacheInterceptor::EnsureRegistered(); + AppCacheInterceptor::EnsureRegistered(); } void ResourceDispatcherHostImpl::OnShutdown() { @@ -958,7 +958,7 @@ void ResourceDispatcherHostImpl::UpdateRequestForTransfer( } } - appcache::AppCacheInterceptor::CompleteCrossSiteTransfer( + AppCacheInterceptor::CompleteCrossSiteTransfer( loader->request(), child_id, request_data.appcache_host_id); @@ -1137,7 +1137,7 @@ void ResourceDispatcherHostImpl::BeginRequest( request_data.resource_type); // Have the appcache associate its extra info with the request. - appcache::AppCacheInterceptor::SetExtraRequestInfo( + AppCacheInterceptor::SetExtraRequestInfo( new_request.get(), filter_->appcache_service(), child_id, request_data.appcache_host_id, request_data.resource_type); diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc index 02e9a1c..6bab366 100644 --- a/content/browser/loader/resource_loader.cc +++ b/content/browser/loader/resource_loader.cc @@ -8,6 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/time/time.h" +#include "content/browser/appcache/appcache_interceptor.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/loader/cross_site_resource_handler.h" #include "content/browser/loader/detachable_resource_handler.h" @@ -29,7 +30,6 @@ #include "net/http/http_response_headers.h" #include "net/ssl/client_cert_store.h" #include "net/url_request/url_request_status.h" -#include "webkit/browser/appcache/appcache_interceptor.h" using base::TimeDelta; using base::TimeTicks; @@ -54,7 +54,7 @@ void PopulateResourceResponse(net::URLRequest* request, response->head.connection_info = response_info.connection_info; response->head.was_fetched_via_proxy = request->was_fetched_via_proxy(); response->head.socket_address = request->GetSocketAddress(); - appcache::AppCacheInterceptor::GetExtraResponseInfo( + AppCacheInterceptor::GetExtraResponseInfo( request, &response->head.appcache_id, &response->head.appcache_manifest_url); |