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

Unified Diff: content/browser/frame_host/render_frame_host_impl.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, 3 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/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 488fad6ac2f16a5c604f863a188a6f637b7552a6..daaaf7078b0a632cfcf4994078ae710ef3ea1df2 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -41,12 +41,14 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/service_worker/service_worker_provider_host.h"
#include "content/common/accessibility_messages.h"
#include "content/common/frame_messages.h"
#include "content/common/input_messages.h"
#include "content/common/inter_process_time_ticks_converter.h"
#include "content/common/navigation_params.h"
#include "content/common/render_frame_setup.mojom.h"
+#include "content/common/service_worker/service_worker_types.h"
#include "content/common/site_isolation_policy.h"
#include "content/common/swapped_out_messages.h"
#include "content/public/browser/ax_event_notification_details.h"
@@ -911,7 +913,8 @@ void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) {
if (!navigation_handle_) {
navigation_handle_ = NavigationHandleImpl::Create(
validated_params.url, frame_tree_node_->IsMainFrame(),
- frame_tree_node_->navigator()->GetDelegate());
+ frame_tree_node_->navigator()->GetDelegate(),
+ ServiceWorkerProviderHost::GetNextNavigationProviderId());
michaeln 2015/10/01 01:42:15 Is this OnDidCommitProvisionalLoad method used in
clamy 2015/10/01 12:41:27 The case here is a synchronous navigation. That me
Fabrice (no longer in Chrome) 2015/10/01 18:29:55 Besides, synchronous navigations should not use th
}
accessibility_reset_count_ = 0;

Powered by Google App Engine
This is Rietveld 408576698