Index: content/browser/frame_host/navigation_request.cc |
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc |
index a99074f2ce3aeb56440b44cc0e9530f0f0c1db39..cf4e114b8b09034b096e74949efa7d4c07d78a8c 100644 |
--- a/content/browser/frame_host/navigation_request.cc |
+++ b/content/browser/frame_host/navigation_request.cc |
@@ -11,6 +11,7 @@ |
#include "content/browser/frame_host/navigation_request_info.h" |
#include "content/browser/frame_host/navigator.h" |
#include "content/browser/loader/navigation_url_loader.h" |
+#include "content/browser/service_worker/service_worker_provider_host.h" |
clamy
2015/08/31 12:09:26
nit: remove unnecessary include.
Fabrice (no longer in Chrome)
2015/08/31 14:00:35
It's needed for ServiceWorkerProviderHost::GetNext
clamy
2015/08/31 16:58:48
Acknowledged.
|
#include "content/browser/site_instance_impl.h" |
#include "content/common/resource_request_body.h" |
#include "content/public/browser/navigation_controller.h" |
@@ -85,10 +86,15 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated( |
scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest( |
frame_tree_node, |
- entry.ConstructCommonNavigationParams(dest_url, dest_referrer, |
- frame_entry, navigation_type), |
- BeginNavigationParams(method, headers.ToString(), |
- LoadFlagFromNavigationType(navigation_type), false), |
+ entry.ConstructCommonNavigationParams( |
+ dest_url, dest_referrer, frame_entry, navigation_type, |
+ ServiceWorkerProviderHost::GetNextBrowserProviderID()), |
+ BeginNavigationParams(method, |
+ headers.ToString(), |
+ LoadFlagFromNavigationType(navigation_type), |
+ false, // has_user_gestures |
+ false, // skip_service_worker |
+ REQUEST_CONTEXT_TYPE_LOCATION), |
clamy
2015/08/31 12:09:27
Same comment on the request context type.
Fabrice (no longer in Chrome)
2015/08/31 14:00:34
Done.
|
entry.ConstructRequestNavigationParams( |
frame_entry, navigation_start, is_same_document_history_load, |
frame_tree_node->has_committed_real_load(), |