Index: content/browser/service_worker/service_worker_unregister_job.cc |
diff --git a/content/browser/service_worker/service_worker_unregister_job.cc b/content/browser/service_worker/service_worker_unregister_job.cc |
index a66f32f5fc4486d4e3f9eb04dddd2f50cce3d4f5..dabcd22f1087c7daed227aa2c66fe5f19c925d15 100644 |
--- a/content/browser/service_worker/service_worker_unregister_job.cc |
+++ b/content/browser/service_worker/service_worker_unregister_job.cc |
@@ -34,6 +34,10 @@ void ServiceWorkerUnregisterJob::Start() { |
weak_factory_.GetWeakPtr())); |
} |
+void ServiceWorkerUnregisterJob::Abort() { |
+ CompleteInternal(SERVICE_WORKER_ERROR_ABORT); |
nhiroki
2014/06/19 10:04:05
UnregisterJob doesn't have the phase, so if we wan
falken
2014/06/19 10:33:35
Either way is fine... I think what you had origina
|
+} |
+ |
bool ServiceWorkerUnregisterJob::Equals(ServiceWorkerRegisterJobBase* job) { |
if (job->GetType() != GetType()) |
return false; |
@@ -70,12 +74,17 @@ void ServiceWorkerUnregisterJob::DeleteExistingRegistration( |
} |
void ServiceWorkerUnregisterJob::Complete(ServiceWorkerStatusCode status) { |
+ CompleteInternal(status); |
+ context_->job_coordinator()->FinishJob(pattern_, this); |
+} |
+ |
+void ServiceWorkerUnregisterJob::CompleteInternal( |
+ ServiceWorkerStatusCode status) { |
for (std::vector<UnregistrationCallback>::iterator it = callbacks_.begin(); |
it != callbacks_.end(); |
++it) { |
it->Run(status); |
} |
- context_->job_coordinator()->FinishJob(pattern_, this); |
} |
} // namespace content |