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

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

Issue 2054203002: service worker: Fix the type of an update promise reject value (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: FIXME => TODO Created 4 years, 5 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
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/update-worker.php » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 13 matching lines...) Expand all
24 else 24 else
25 *message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status)); 25 *message = base::ASCIIToUTF16(ServiceWorkerStatusToString(status));
26 switch (status) { 26 switch (status) {
27 case SERVICE_WORKER_OK: 27 case SERVICE_WORKER_OK:
28 NOTREACHED() << "Calling this when status == OK is not allowed"; 28 NOTREACHED() << "Calling this when status == OK is not allowed";
29 return; 29 return;
30 30
31 case SERVICE_WORKER_ERROR_START_WORKER_FAILED: 31 case SERVICE_WORKER_ERROR_START_WORKER_FAILED:
32 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: 32 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED:
33 case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND: 33 case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND:
34 case SERVICE_WORKER_ERROR_SCRIPT_EVALUATE_FAILED:
35 case SERVICE_WORKER_ERROR_REDUNDANT: 34 case SERVICE_WORKER_ERROR_REDUNDANT:
36 case SERVICE_WORKER_ERROR_DISALLOWED: 35 case SERVICE_WORKER_ERROR_DISALLOWED:
37 *error_type = WebServiceWorkerError::ErrorTypeInstall; 36 *error_type = WebServiceWorkerError::ErrorTypeInstall;
38 return; 37 return;
39 38
40 case SERVICE_WORKER_ERROR_NOT_FOUND: 39 case SERVICE_WORKER_ERROR_NOT_FOUND:
41 *error_type = WebServiceWorkerError::ErrorTypeNotFound; 40 *error_type = WebServiceWorkerError::ErrorTypeNotFound;
42 return; 41 return;
43 42
44 case SERVICE_WORKER_ERROR_NETWORK: 43 case SERVICE_WORKER_ERROR_NETWORK:
45 *error_type = WebServiceWorkerError::ErrorTypeNetwork; 44 *error_type = WebServiceWorkerError::ErrorTypeNetwork;
46 return; 45 return;
47 46
47 case SERVICE_WORKER_ERROR_SCRIPT_EVALUATE_FAILED:
48 *error_type = WebServiceWorkerError::ErrorTypeScriptEvaluateFailed;
49 return;
50
48 case SERVICE_WORKER_ERROR_SECURITY: 51 case SERVICE_WORKER_ERROR_SECURITY:
49 *error_type = WebServiceWorkerError::ErrorTypeSecurity; 52 *error_type = WebServiceWorkerError::ErrorTypeSecurity;
50 return; 53 return;
51 54
52 case SERVICE_WORKER_ERROR_TIMEOUT: 55 case SERVICE_WORKER_ERROR_TIMEOUT:
53 *error_type = WebServiceWorkerError::ErrorTypeTimeout; 56 *error_type = WebServiceWorkerError::ErrorTypeTimeout;
54 return; 57 return;
55 58
56 case SERVICE_WORKER_ERROR_ABORT: 59 case SERVICE_WORKER_ERROR_ABORT:
57 *error_type = WebServiceWorkerError::ErrorTypeAbort; 60 *error_type = WebServiceWorkerError::ErrorTypeAbort;
58 return; 61 return;
59 62
60 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED: 63 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED:
61 case SERVICE_WORKER_ERROR_IPC_FAILED: 64 case SERVICE_WORKER_ERROR_IPC_FAILED:
62 case SERVICE_WORKER_ERROR_FAILED: 65 case SERVICE_WORKER_ERROR_FAILED:
63 case SERVICE_WORKER_ERROR_EXISTS: 66 case SERVICE_WORKER_ERROR_EXISTS:
64 case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED: 67 case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED:
65 case SERVICE_WORKER_ERROR_STATE: 68 case SERVICE_WORKER_ERROR_STATE:
66 case SERVICE_WORKER_ERROR_DISK_CACHE: 69 case SERVICE_WORKER_ERROR_DISK_CACHE:
67 case SERVICE_WORKER_ERROR_MAX_VALUE: 70 case SERVICE_WORKER_ERROR_MAX_VALUE:
68 // Unexpected, or should have bailed out before calling this, or we don't 71 // Unexpected, or should have bailed out before calling this, or we don't
69 // have a corresponding blink error code yet. 72 // have a corresponding blink error code yet.
70 break; // Fall through to NOTREACHED(). 73 break; // Fall through to NOTREACHED().
71 } 74 }
72 NOTREACHED() << "Got unexpected error code: " 75 NOTREACHED() << "Got unexpected error code: "
73 << status << " " << ServiceWorkerStatusToString(status); 76 << status << " " << ServiceWorkerStatusToString(status);
74 } 77 }
75 78
76 } // namespace content 79 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/update-worker.php » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698