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

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

Issue 147593006: Refine error code returned by ServiceWorkerVersion::StartWorker (e.g. PROCESS_NOT_FOUND etc) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 7c20ba73b37a65a79712b08507b2e9a138253d76..323a94a653d3a72248c4b4ab7ad63457324f9b3d 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -130,12 +130,12 @@ void ServiceWorkerVersion::StartWorker(const StatusCallback& callback) {
return;
}
observer_.reset(new StartObserver(this, callback));
- const bool started = embedded_worker_->Start(
+ ServiceWorkerStatusCode status = embedded_worker_->Start(
version_id_,
registration_->script_url());
- if (!started) {
+ if (status != SERVICE_WORKER_OK) {
observer_.reset();
- RunSoon(base::Bind(callback, SERVICE_WORKER_ERROR_START_WORKER_FAILED));
+ RunSoon(base::Bind(callback, status));
}
}
@@ -147,10 +147,10 @@ void ServiceWorkerVersion::StopWorker(const StatusCallback& callback) {
return;
}
observer_.reset(new StopObserver(this, callback));
- const bool stopped = embedded_worker_->Stop();
- if (!stopped) {
+ ServiceWorkerStatusCode status = embedded_worker_->Stop();
+ if (status != SERVICE_WORKER_OK) {
observer_.reset();
- RunSoon(base::Bind(callback, SERVICE_WORKER_ERROR_FAILED));
+ RunSoon(base::Bind(callback, status));
}
}
@@ -159,7 +159,7 @@ bool ServiceWorkerVersion::DispatchFetchEvent(
if (status() != RUNNING)
return false;
return embedded_worker_->SendMessage(
- ServiceWorkerMsg_FetchEvent(request));
+ ServiceWorkerMsg_FetchEvent(request)) == SERVICE_WORKER_OK;
}
void ServiceWorkerVersion::AddProcessToWorker(int process_id) {

Powered by Google App Engine
This is Rietveld 408576698