Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1376)

Unified Diff: content/browser/frame_host/navigation_request.cc

Issue 1294243004: PlzNavigate: Make ServiceWorker work with PlzNavigate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..3dacb4ca7c074c7e095c4817aad610130129e8fe 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"
#include "content/browser/site_instance_impl.h"
#include "content/common/resource_request_body.h"
#include "content/public/browser/navigation_controller.h"
@@ -85,10 +86,18 @@ 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/27 11:53:45 I'm not sure this is the best context type for a b
carlosk 2015/08/27 14:26:42 If you do this change here remember that there are
Fabrice (no longer in Chrome) 2015/08/28 15:40:15 I left LOCATION for now, I'd like some more people
+ frame_tree_node->IsMainFrame() ?
+ REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL :
+ REQUEST_CONTEXT_FRAME_TYPE_NESTED),
entry.ConstructRequestNavigationParams(
frame_entry, navigation_start, is_same_document_history_load,
frame_tree_node->has_committed_real_load(),

Powered by Google App Engine
This is Rietveld 408576698