OLD | NEW |
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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "content/browser/frame_host/navigation_request_info.h" | 9 #include "content/browser/frame_host/navigation_request_info.h" |
10 #include "content/browser/loader/navigation_url_loader_factory.h" | 10 #include "content/browser/loader/navigation_url_loader_factory.h" |
11 #include "content/browser/loader/navigation_url_loader_impl.h" | 11 #include "content/browser/loader/navigation_url_loader_impl.h" |
| 12 #include "content/public/browser/navigation_ui_data.h" |
12 | 13 |
13 namespace content { | 14 namespace content { |
14 | 15 |
15 static NavigationURLLoaderFactory* g_factory = nullptr; | 16 static NavigationURLLoaderFactory* g_factory = nullptr; |
16 | 17 |
17 std::unique_ptr<NavigationURLLoader> NavigationURLLoader::Create( | 18 std::unique_ptr<NavigationURLLoader> NavigationURLLoader::Create( |
18 BrowserContext* browser_context, | 19 BrowserContext* browser_context, |
19 std::unique_ptr<NavigationRequestInfo> request_info, | 20 std::unique_ptr<NavigationRequestInfo> request_info, |
| 21 std::unique_ptr<NavigationUIData> navigation_ui_data, |
20 ServiceWorkerNavigationHandle* service_worker_handle, | 22 ServiceWorkerNavigationHandle* service_worker_handle, |
21 NavigationURLLoaderDelegate* delegate) { | 23 NavigationURLLoaderDelegate* delegate) { |
22 if (g_factory) { | 24 if (g_factory) { |
23 return g_factory->CreateLoader(browser_context, std::move(request_info), | 25 return g_factory->CreateLoader(browser_context, std::move(request_info), |
| 26 std::move(navigation_ui_data), |
24 service_worker_handle, delegate); | 27 service_worker_handle, delegate); |
25 } | 28 } |
26 return std::unique_ptr<NavigationURLLoader>( | 29 return std::unique_ptr<NavigationURLLoader>(new NavigationURLLoaderImpl( |
27 new NavigationURLLoaderImpl(browser_context, std::move(request_info), | 30 browser_context, std::move(request_info), std::move(navigation_ui_data), |
28 service_worker_handle, delegate)); | 31 service_worker_handle, delegate)); |
29 } | 32 } |
30 | 33 |
31 void NavigationURLLoader::SetFactoryForTesting( | 34 void NavigationURLLoader::SetFactoryForTesting( |
32 NavigationURLLoaderFactory* factory) { | 35 NavigationURLLoaderFactory* factory) { |
33 DCHECK(g_factory == nullptr || factory == nullptr); | 36 DCHECK(g_factory == nullptr || factory == nullptr); |
34 g_factory = factory; | 37 g_factory = factory; |
35 } | 38 } |
36 | 39 |
37 } // namespace content | 40 } // namespace content |
OLD | NEW |