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

Side by Side Diff: content/browser/service_worker/service_worker_registration_status.cc

Issue 1063823005: Service Worker: Use more specific errors when StartWorker fails (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update histograms.xml Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/service_worker_registration_status.h" 5 #include "content/browser/service_worker/service_worker_registration_status.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 9
10 namespace content { 10 namespace content {
(...skipping 10 matching lines...) Expand all
21 *message = base::UTF8ToUTF16(status_message); 21 *message = base::UTF8ToUTF16(status_message);
22 else 22 else
23 *message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status)); 23 *message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status));
24 switch (status) { 24 switch (status) {
25 case SERVICE_WORKER_OK: 25 case SERVICE_WORKER_OK:
26 NOTREACHED() << "Calling this when status == OK is not allowed"; 26 NOTREACHED() << "Calling this when status == OK is not allowed";
27 return; 27 return;
28 28
29 case SERVICE_WORKER_ERROR_START_WORKER_FAILED: 29 case SERVICE_WORKER_ERROR_START_WORKER_FAILED:
30 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: 30 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED:
31 case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND:
32 case SERVICE_WORKER_ERROR_SCRIPT_EVALUATE_FAILED:
31 *error_type = WebServiceWorkerError::ErrorTypeInstall; 33 *error_type = WebServiceWorkerError::ErrorTypeInstall;
32 return; 34 return;
33 35
34 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED:
35 *error_type = WebServiceWorkerError::ErrorTypeActivate;
36 return;
37
38 case SERVICE_WORKER_ERROR_NOT_FOUND: 36 case SERVICE_WORKER_ERROR_NOT_FOUND:
39 *error_type = WebServiceWorkerError::ErrorTypeNotFound; 37 *error_type = WebServiceWorkerError::ErrorTypeNotFound;
40 return; 38 return;
41 39
42 case SERVICE_WORKER_ERROR_NETWORK: 40 case SERVICE_WORKER_ERROR_NETWORK:
43 *error_type = WebServiceWorkerError::ErrorTypeNetwork; 41 *error_type = WebServiceWorkerError::ErrorTypeNetwork;
44 return; 42 return;
45 43
46 case SERVICE_WORKER_ERROR_SECURITY: 44 case SERVICE_WORKER_ERROR_SECURITY:
47 *error_type = WebServiceWorkerError::ErrorTypeSecurity; 45 *error_type = WebServiceWorkerError::ErrorTypeSecurity;
48 return; 46 return;
49 47
50 case SERVICE_WORKER_ERROR_TIMEOUT: 48 case SERVICE_WORKER_ERROR_TIMEOUT:
51 *error_type = WebServiceWorkerError::ErrorTypeTimeout; 49 *error_type = WebServiceWorkerError::ErrorTypeTimeout;
52 return; 50 return;
53 51
54 case SERVICE_WORKER_ERROR_ABORT: 52 case SERVICE_WORKER_ERROR_ABORT:
55 *error_type = WebServiceWorkerError::ErrorTypeAbort; 53 *error_type = WebServiceWorkerError::ErrorTypeAbort;
56 return; 54 return;
57 55
56 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED:
58 case SERVICE_WORKER_ERROR_IPC_FAILED: 57 case SERVICE_WORKER_ERROR_IPC_FAILED:
59 case SERVICE_WORKER_ERROR_FAILED: 58 case SERVICE_WORKER_ERROR_FAILED:
60 case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND:
61 case SERVICE_WORKER_ERROR_EXISTS: 59 case SERVICE_WORKER_ERROR_EXISTS:
62 case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED: 60 case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED:
63 case SERVICE_WORKER_ERROR_STATE: 61 case SERVICE_WORKER_ERROR_STATE:
64 case SERVICE_WORKER_ERROR_MAX_VALUE: 62 case SERVICE_WORKER_ERROR_MAX_VALUE:
65 // Unexpected, or should have bailed out before calling this, or we don't 63 // Unexpected, or should have bailed out before calling this, or we don't
66 // have a corresponding blink error code yet. 64 // have a corresponding blink error code yet.
67 break; // Fall through to NOTREACHED(). 65 break; // Fall through to NOTREACHED().
68 } 66 }
69 NOTREACHED() << "Got unexpected error code: " 67 NOTREACHED() << "Got unexpected error code: "
70 << status << " " << ServiceWorkerStatusToString(status); 68 << status << " " << ServiceWorkerStatusToString(status);
71 } 69 }
72 70
73 } // namespace content 71 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/service_worker_register_job.cc ('k') | content/browser/service_worker/service_worker_version.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698