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

Side by Side Diff: content/browser/loader/navigation_url_loader.cc

Issue 1399363004: PlzNavigate: Make ServiceWorker work with PlzNavigate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Kinuko's comments Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/navigation_url_loader.h" 5 #include "content/browser/loader/navigation_url_loader.h"
6 6
7 #include "content/browser/frame_host/navigation_request_info.h" 7 #include "content/browser/frame_host/navigation_request_info.h"
8 #include "content/browser/loader/navigation_url_loader_factory.h" 8 #include "content/browser/loader/navigation_url_loader_factory.h"
9 #include "content/browser/loader/navigation_url_loader_impl.h" 9 #include "content/browser/loader/navigation_url_loader_impl.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 static NavigationURLLoaderFactory* g_factory = nullptr; 13 static NavigationURLLoaderFactory* g_factory = nullptr;
14 14
15 scoped_ptr<NavigationURLLoader> NavigationURLLoader::Create( 15 scoped_ptr<NavigationURLLoader> NavigationURLLoader::Create(
16 BrowserContext* browser_context, 16 BrowserContext* browser_context,
17 scoped_ptr<NavigationRequestInfo> request_info, 17 scoped_ptr<NavigationRequestInfo> request_info,
18 ServiceWorkerNavigationHandle* service_worker_handle,
18 NavigationURLLoaderDelegate* delegate) { 19 NavigationURLLoaderDelegate* delegate) {
19 if (g_factory) { 20 if (g_factory) {
20 return g_factory->CreateLoader(browser_context, request_info.Pass(), 21 return g_factory->CreateLoader(browser_context, request_info.Pass(),
21 delegate); 22 service_worker_handle, delegate);
22 } 23 }
23 return scoped_ptr<NavigationURLLoader>(new NavigationURLLoaderImpl( 24 return scoped_ptr<NavigationURLLoader>(new NavigationURLLoaderImpl(
24 browser_context, request_info.Pass(), delegate)); 25 browser_context, request_info.Pass(), service_worker_handle, delegate));
25 } 26 }
26 27
27 void NavigationURLLoader::SetFactoryForTesting( 28 void NavigationURLLoader::SetFactoryForTesting(
28 NavigationURLLoaderFactory* factory) { 29 NavigationURLLoaderFactory* factory) {
29 DCHECK(g_factory == nullptr || factory == nullptr); 30 DCHECK(g_factory == nullptr || factory == nullptr);
30 g_factory = factory; 31 g_factory = factory;
31 } 32 }
32 33
33 } // namespace content 34 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698