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

Side by Side Diff: content/browser/push_messaging/push_messaging_router.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/push_messaging/push_messaging_router.h" 5 #include "content/browser/push_messaging/push_messaging_router.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/browser/service_worker/service_worker_context_wrapper.h" 8 #include "content/browser/service_worker/service_worker_context_wrapper.h"
9 #include "content/browser/service_worker/service_worker_registration.h" 9 #include "content/browser/service_worker/service_worker_registration.h"
10 #include "content/browser/service_worker/service_worker_storage.h" 10 #include "content/browser/service_worker/service_worker_storage.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED: 101 case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED:
102 delivery_status = PUSH_DELIVERY_STATUS_EVENT_WAITUNTIL_REJECTED; 102 delivery_status = PUSH_DELIVERY_STATUS_EVENT_WAITUNTIL_REJECTED;
103 break; 103 break;
104 case SERVICE_WORKER_ERROR_FAILED: 104 case SERVICE_WORKER_ERROR_FAILED:
105 case SERVICE_WORKER_ERROR_ABORT: 105 case SERVICE_WORKER_ERROR_ABORT:
106 case SERVICE_WORKER_ERROR_START_WORKER_FAILED: 106 case SERVICE_WORKER_ERROR_START_WORKER_FAILED:
107 case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND: 107 case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND:
108 case SERVICE_WORKER_ERROR_NOT_FOUND: 108 case SERVICE_WORKER_ERROR_NOT_FOUND:
109 case SERVICE_WORKER_ERROR_IPC_FAILED: 109 case SERVICE_WORKER_ERROR_IPC_FAILED:
110 case SERVICE_WORKER_ERROR_TIMEOUT: 110 case SERVICE_WORKER_ERROR_TIMEOUT:
111 case SERVICE_WORKER_ERROR_SCRIPT_EVALUATE_FAILED:
111 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; 112 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR;
112 break; 113 break;
113 case SERVICE_WORKER_ERROR_EXISTS: 114 case SERVICE_WORKER_ERROR_EXISTS:
114 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: 115 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED:
115 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED: 116 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED:
116 case SERVICE_WORKER_ERROR_NETWORK: 117 case SERVICE_WORKER_ERROR_NETWORK:
117 case SERVICE_WORKER_ERROR_SECURITY: 118 case SERVICE_WORKER_ERROR_SECURITY:
118 case SERVICE_WORKER_ERROR_STATE: 119 case SERVICE_WORKER_ERROR_STATE:
119 case SERVICE_WORKER_ERROR_MAX_VALUE: 120 case SERVICE_WORKER_ERROR_MAX_VALUE:
120 NOTREACHED() << "Got unexpected error code: " << service_worker_status 121 NOTREACHED() << "Got unexpected error code: " << service_worker_status
121 << " " << ServiceWorkerStatusToString(service_worker_status); 122 << " " << ServiceWorkerStatusToString(service_worker_status);
122 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; 123 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR;
123 break; 124 break;
124 } 125 }
125 BrowserThread::PostTask( 126 BrowserThread::PostTask(
126 BrowserThread::UI, 127 BrowserThread::UI,
127 FROM_HERE, 128 FROM_HERE,
128 base::Bind(deliver_message_callback, delivery_status)); 129 base::Bind(deliver_message_callback, delivery_status));
129 } 130 }
130 131
131 } // namespace content 132 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698