| Index: content/browser/service_worker/service_worker_register_job.h
|
| diff --git a/content/browser/service_worker/service_worker_register_job.h b/content/browser/service_worker/service_worker_register_job.h
|
| index 4fff29b8c55116741e7ab7d668e36ac11c0bd0d2..9ccb64332679fb64ca25a4c24ca4101b1f3ca3b5 100644
|
| --- a/content/browser/service_worker/service_worker_register_job.h
|
| +++ b/content/browser/service_worker/service_worker_register_job.h
|
| @@ -14,7 +14,9 @@
|
| #include "content/browser/service_worker/embedded_worker_instance.h"
|
| #include "content/browser/service_worker/service_worker_register_job_base.h"
|
| #include "content/browser/service_worker/service_worker_registration.h"
|
| +#include "content/common/service_worker/service_worker_event_dispatcher.mojom.h"
|
| #include "content/common/service_worker/service_worker_status_code.h"
|
| +#include "mojo/public/cpp/bindings/associated_binding.h"
|
| #include "url/gurl.h"
|
|
|
| namespace content {
|
| @@ -34,7 +36,8 @@ namespace content {
|
| // - designating the new version to be the 'active' version
|
| // - updating storage
|
| class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,
|
| - public EmbeddedWorkerInstance::Listener {
|
| + public EmbeddedWorkerInstance::Listener,
|
| + public mojom::InstallEventMethod {
|
| public:
|
| typedef base::Callback<void(ServiceWorkerStatusCode status,
|
| const std::string& status_message,
|
| @@ -99,6 +102,10 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,
|
| void set_new_version(ServiceWorkerVersion* version);
|
| ServiceWorkerVersion* new_version();
|
|
|
| + // mojom::InstallEventMethod implementation.
|
| + void Register(const std::vector<GURL>& sub_scopes,
|
| + const std::vector<url::Origin>& origins) override;
|
| +
|
| void SetPhase(Phase phase);
|
|
|
| void StartImpl();
|
| @@ -121,7 +128,7 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,
|
| void InstallAndContinue();
|
| void DispatchInstallEvent();
|
| void OnInstallFinished(int request_id,
|
| - blink::WebServiceWorkerEventResult result,
|
| + ServiceWorkerStatusCode status,
|
| bool has_fetch_handler,
|
| base::Time dispatch_event_time);
|
| void OnInstallFailed(ServiceWorkerStatusCode status);
|
| @@ -145,6 +152,9 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,
|
| // The ServiceWorkerContextCore object should always outlive this.
|
| base::WeakPtr<ServiceWorkerContextCore> context_;
|
|
|
| + // Binding for InstallEventMethod.
|
| + mojo::AssociatedBinding<InstallEventMethod> install_method_binding_;
|
| +
|
| RegistrationJobType job_type_;
|
| const GURL pattern_;
|
| GURL script_url_;
|
|
|