| OLD | NEW | 
|    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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  100       break; |  100       break; | 
|  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       delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; |  111       delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; | 
|  111       break; |  112       break; | 
|  112     case SERVICE_WORKER_ERROR_EXISTS: |  113     case SERVICE_WORKER_ERROR_EXISTS: | 
|  113     case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: |  114     case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: | 
|  114     case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED: |  115     case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED: | 
|  115     case SERVICE_WORKER_ERROR_NETWORK: |  116     case SERVICE_WORKER_ERROR_NETWORK: | 
|  116     case SERVICE_WORKER_ERROR_SECURITY: |  117     case SERVICE_WORKER_ERROR_SECURITY: | 
|  117     case SERVICE_WORKER_ERROR_STATE: |  118     case SERVICE_WORKER_ERROR_STATE: | 
 |  119     case SERVICE_WORKER_ERROR_MAX_VALUE: | 
|  118       NOTREACHED() << "Got unexpected error code: " << service_worker_status |  120       NOTREACHED() << "Got unexpected error code: " << service_worker_status | 
|  119                    << " " << ServiceWorkerStatusToString(service_worker_status); |  121                    << " " << ServiceWorkerStatusToString(service_worker_status); | 
|  120       delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; |  122       delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; | 
|  121       break; |  123       break; | 
|  122   } |  124   } | 
|  123   BrowserThread::PostTask( |  125   BrowserThread::PostTask( | 
|  124       BrowserThread::UI, |  126       BrowserThread::UI, | 
|  125       FROM_HERE, |  127       FROM_HERE, | 
|  126       base::Bind(deliver_message_callback, delivery_status)); |  128       base::Bind(deliver_message_callback, delivery_status)); | 
|  127 } |  129 } | 
|  128  |  130  | 
|  129 }  // namespace content |  131 }  // namespace content | 
| OLD | NEW |