Chromium Code Reviews| Index: content/browser/loader/resource_dispatcher_host_impl.cc |
| diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc |
| index 5600a23455fc80f8f2a6592077a78be2babcb165..5b287bc575ecc2ce72d9135f962f8cfe49b9148a 100644 |
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc |
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc |
| @@ -1307,17 +1307,12 @@ void ResourceDispatcherHostImpl::BeginRequest( |
| // Initialize the service worker handler for the request. We don't use |
| // ServiceWorker for synchronous loads to avoid renderer deadlocks. |
| ServiceWorkerRequestHandler::InitializeHandler( |
| - new_request.get(), |
| - filter_->service_worker_context(), |
| - blob_context, |
| - child_id, |
| - request_data.service_worker_provider_id, |
| + new_request.get(), filter_->service_worker_context(), blob_context, |
| + child_id, request_data.service_worker_provider_id, |
| request_data.skip_service_worker || is_sync_load, |
| - request_data.fetch_request_mode, |
| - request_data.fetch_credentials_mode, |
| - request_data.resource_type, |
| - request_data.fetch_request_context_type, |
| - request_data.fetch_frame_type, |
| + request_data.fetch_request_mode, request_data.fetch_credentials_mode, |
| + request_data.fetch_redirect_mode, request_data.resource_type, |
| + request_data.fetch_request_context_type, request_data.fetch_frame_type, |
| request_data.request_body); |
| // Have the appcache associate its extra info with the request. |
| @@ -1539,7 +1534,7 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo( |
| -1, // parent_render_frame_id |
| RESOURCE_TYPE_SUB_RESOURCE, |
| ui::PAGE_TRANSITION_LINK, |
| - false, // should_replace_current_entry |
| + false, // should_replace_current_entry, |
|
mmenke
2015/08/14 16:12:05
nit: Remove comma
horo
2015/08/14 18:46:12
Done.
|
| download, // is_download |
| false, // is_stream |
| download, // allow_download |