Commit 92549ad6 authored by dominicc@chromium.org's avatar dominicc@chromium.org

Use new WebServiceWorkerError::ErrorType names.

BUG=373594

Review URL: https://codereview.chromium.org/289963002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270984 0039d316-1c4b-4281-b951-d872f2087c98
parent aa639c5f
...@@ -157,7 +157,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker( ...@@ -157,7 +157,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError( Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
thread_id, thread_id,
request_id, request_id,
WebServiceWorkerError::DisabledError, WebServiceWorkerError::ErrorTypeDisabled,
base::ASCIIToUTF16(kDisabledErrorMessage))); base::ASCIIToUTF16(kDisabledErrorMessage)));
return; return;
} }
...@@ -169,7 +169,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker( ...@@ -169,7 +169,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError( Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
thread_id, thread_id,
request_id, request_id,
WebServiceWorkerError::SecurityError, WebServiceWorkerError::ErrorTypeSecurity,
base::ASCIIToUTF16(kDomainMismatchErrorMessage))); base::ASCIIToUTF16(kDomainMismatchErrorMessage)));
return; return;
} }
...@@ -204,7 +204,7 @@ void ServiceWorkerDispatcherHost::OnUnregisterServiceWorker( ...@@ -204,7 +204,7 @@ void ServiceWorkerDispatcherHost::OnUnregisterServiceWorker(
Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError( Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
thread_id, thread_id,
request_id, request_id,
blink::WebServiceWorkerError::DisabledError, blink::WebServiceWorkerError::ErrorTypeDisabled,
base::ASCIIToUTF16(kDisabledErrorMessage))); base::ASCIIToUTF16(kDisabledErrorMessage)));
return; return;
} }
......
...@@ -15,7 +15,7 @@ void GetServiceWorkerRegistrationStatusResponse( ...@@ -15,7 +15,7 @@ void GetServiceWorkerRegistrationStatusResponse(
ServiceWorkerStatusCode status, ServiceWorkerStatusCode status,
blink::WebServiceWorkerError::ErrorType* error_type, blink::WebServiceWorkerError::ErrorType* error_type,
base::string16* message) { base::string16* message) {
*error_type = WebServiceWorkerError::UnknownError; *error_type = WebServiceWorkerError::ErrorTypeUnknown;
*message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status)); *message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status));
switch (status) { switch (status) {
case SERVICE_WORKER_OK: case SERVICE_WORKER_OK:
...@@ -24,15 +24,15 @@ void GetServiceWorkerRegistrationStatusResponse( ...@@ -24,15 +24,15 @@ void GetServiceWorkerRegistrationStatusResponse(
case SERVICE_WORKER_ERROR_START_WORKER_FAILED: case SERVICE_WORKER_ERROR_START_WORKER_FAILED:
case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED:
*error_type = WebServiceWorkerError::InstallError; *error_type = WebServiceWorkerError::ErrorTypeInstall;
return; return;
case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED: case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED:
*error_type = WebServiceWorkerError::ActivateError; *error_type = WebServiceWorkerError::ErrorTypeActivate;
return; return;
case SERVICE_WORKER_ERROR_NOT_FOUND: case SERVICE_WORKER_ERROR_NOT_FOUND:
*error_type = WebServiceWorkerError::NotFoundError; *error_type = WebServiceWorkerError::ErrorTypeNotFound;
return; return;
case SERVICE_WORKER_ERROR_ABORT: case SERVICE_WORKER_ERROR_ABORT:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment