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

Side by Side Diff: content/browser/push_messaging/push_messaging_router.cc

Issue 871853002: ServiceWorker: add ServiceWorkerClients.claim() support (2/3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove assignment within conditional expression Created 5 years, 10 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; 110 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR;
111 break; 111 break;
112 case SERVICE_WORKER_ERROR_EXISTS: 112 case SERVICE_WORKER_ERROR_EXISTS:
113 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: 113 case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED:
114 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED: 114 case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED:
115 case SERVICE_WORKER_ERROR_NETWORK: 115 case SERVICE_WORKER_ERROR_NETWORK:
116 case SERVICE_WORKER_ERROR_SECURITY: 116 case SERVICE_WORKER_ERROR_SECURITY:
117 case SERVICE_WORKER_ERROR_STATE:
117 NOTREACHED() << "Got unexpected error code: " << service_worker_status 118 NOTREACHED() << "Got unexpected error code: " << service_worker_status
118 << " " << ServiceWorkerStatusToString(service_worker_status); 119 << " " << ServiceWorkerStatusToString(service_worker_status);
119 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; 120 delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR;
120 break; 121 break;
121 } 122 }
122 BrowserThread::PostTask( 123 BrowserThread::PostTask(
123 BrowserThread::UI, 124 BrowserThread::UI,
124 FROM_HERE, 125 FROM_HERE,
125 base::Bind(deliver_message_callback, delivery_status)); 126 base::Bind(deliver_message_callback, delivery_status));
126 } 127 }
127 128
128 } // namespace content 129 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698