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

Unified Diff: content/browser/service_worker/service_worker_register_job.cc

Issue 2746783002: [ServiceWorker] Mojofy InstallEvent of Service Worker (Closed)
Patch Set: Created 3 years, 9 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/service_worker/service_worker_register_job.cc
diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc
index 2fcdbfb1a63cae53e7632d897fe9b0641f083d60..cff8fccbe17714807f2fb0bf17b11e8ddfef01dd 100644
--- a/content/browser/service_worker/service_worker_register_job.cc
+++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -431,34 +431,19 @@ void ServiceWorkerRegisterJob::DispatchInstallEvent() {
ServiceWorkerMetrics::EventType::INSTALL,
base::Bind(&ServiceWorkerRegisterJob::OnInstallFailed,
weak_factory_.GetWeakPtr()));
- new_version()
- ->RegisterRequestCallback<ServiceWorkerHostMsg_InstallEventFinished>(
- request_id, base::Bind(&ServiceWorkerRegisterJob::OnInstallFinished,
- weak_factory_.GetWeakPtr()));
- new_version()->DispatchEvent({request_id},
- ServiceWorkerMsg_InstallEvent(request_id));
+
+ new_version()->event_dispatcher()->DispatchInstallEvent(
+ base::Bind(&ServiceWorkerRegisterJob::OnInstallFinished,
+ weak_factory_.GetWeakPtr(), request_id));
}
void ServiceWorkerRegisterJob::OnInstallFinished(
int request_id,
- blink::WebServiceWorkerEventResult result,
+ ServiceWorkerStatusCode status,
bool has_fetch_handler,
base::Time dispatch_event_time) {
- new_version()->FinishRequest(
- request_id, result == blink::WebServiceWorkerEventResultCompleted,
- dispatch_event_time);
-
- ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
- switch (result) {
- case blink::WebServiceWorkerEventResultCompleted:
- status = SERVICE_WORKER_OK;
- break;
- case blink::WebServiceWorkerEventResultRejected:
- status = SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED;
- break;
- default:
- NOTREACHED();
- }
+ new_version()->FinishRequest(request_id, status == SERVICE_WORKER_OK,
falken 2017/03/14 08:49:26 By the way, this status == OK bool is not actually
xiaofengzhang 2017/04/01 02:27:21 thanks, falken, so I should keep it in this patch,
+ dispatch_event_time);
if (status != SERVICE_WORKER_OK) {
OnInstallFailed(status);

Powered by Google App Engine
This is Rietveld 408576698