Index: content/browser/service_worker/service_worker_fetch_dispatcher.h |
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.h b/content/browser/service_worker/service_worker_fetch_dispatcher.h |
index 3d32ce39b79c2e463d71e2dd3919263c21bfa80a..607436d9d8d81843717b3baedda8ea1037bdd03f 100644 |
--- a/content/browser/service_worker/service_worker_fetch_dispatcher.h |
+++ b/content/browser/service_worker/service_worker_fetch_dispatcher.h |
@@ -14,6 +14,7 @@ |
#include "content/common/service_worker/service_worker_status_code.h" |
#include "content/common/service_worker/service_worker_types.h" |
#include "content/public/common/resource_type.h" |
+#include "mojo/public/cpp/bindings/interface_request.h" |
#include "net/log/net_log_with_source.h" |
namespace net { |
@@ -22,16 +23,22 @@ class URLRequest; |
namespace content { |
+namespace mojom { |
+class URLLoaderFactory; |
+} // namespace mojom |
+ |
class ServiceWorkerVersion; |
// A helper class to dispatch fetch event to a service worker. |
class CONTENT_EXPORT ServiceWorkerFetchDispatcher { |
public: |
- typedef base::Callback<void(ServiceWorkerStatusCode, |
- ServiceWorkerFetchEventResult, |
- const ServiceWorkerResponse&, |
- const scoped_refptr<ServiceWorkerVersion>&)> |
- FetchCallback; |
+ using URLLoaderFactoryCallback = |
+ base::Callback<bool(mojo::InterfaceRequest<mojom::URLLoaderFactory>)>; |
falken
2016/10/19 05:11:28
Can we move this declaration to service_worker_typ
horo
2016/10/19 06:22:52
Done.
|
+ using FetchCallback = |
+ base::Callback<void(ServiceWorkerStatusCode, |
+ ServiceWorkerFetchEventResult, |
+ const ServiceWorkerResponse&, |
+ const scoped_refptr<ServiceWorkerVersion>&)>; |
ServiceWorkerFetchDispatcher( |
std::unique_ptr<ServiceWorkerFetchRequest> request, |
@@ -44,7 +51,9 @@ class CONTENT_EXPORT ServiceWorkerFetchDispatcher { |
// If appropriate, starts the navigation preload request and creates |
// |preload_handle_|. |
- void MaybeStartNavigationPreload(net::URLRequest* original_request); |
+ void MaybeStartNavigationPreload( |
+ net::URLRequest* original_request, |
+ const URLLoaderFactoryCallback& url_loader_factory_callback); |
// Dispatches a fetch event to the |version| given in ctor, and fires |
// |fetch_callback| (also given in ctor) when finishes. It runs |