| 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/renderer/push_messaging_dispatcher.h" | 5 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "content/child/service_worker/web_service_worker_registration_impl.h" | 8 #include "content/child/service_worker/web_service_worker_registration_impl.h" |
| 9 #include "content/common/push_messaging_messages.h" | 9 #include "content/common/push_messaging_messages.h" |
| 10 #include "content/renderer/manifest/manifest_manager.h" | 10 #include "content/renderer/manifest/manifest_manager.h" |
| 11 #include "content/renderer/render_frame_impl.h" | 11 #include "content/renderer/render_frame_impl.h" |
| 12 #include "ipc/ipc_message.h" | 12 #include "ipc/ipc_message.h" |
| 13 #include "third_party/WebKit/public/platform/WebPushError.h" | 13 #include "third_party/WebKit/public/platform/WebPushError.h" |
| 14 #include "third_party/WebKit/public/platform/WebPushRegistration.h" | 14 #include "third_party/WebKit/public/platform/WebPushRegistration.h" |
| 15 #include "third_party/WebKit/public/platform/WebServiceWorkerRegistration.h" | 15 #include "third_party/WebKit/public/platform/WebServiceWorkerRegistration.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 DCHECK(callbacks); | 101 DCHECK(callbacks); |
| 102 | 102 |
| 103 scoped_ptr<blink::WebPushError> error(new blink::WebPushError( | 103 scoped_ptr<blink::WebPushError> error(new blink::WebPushError( |
| 104 blink::WebPushError::ErrorTypeAbort, | 104 blink::WebPushError::ErrorTypeAbort, |
| 105 WebString::fromUTF8(PushRegistrationStatusToString(status)))); | 105 WebString::fromUTF8(PushRegistrationStatusToString(status)))); |
| 106 callbacks->onError(error.release()); | 106 callbacks->onError(error.release()); |
| 107 registration_callbacks_.Remove(request_id); | 107 registration_callbacks_.Remove(request_id); |
| 108 } | 108 } |
| 109 | 109 |
| 110 } // namespace content | 110 } // namespace content |
| OLD | NEW |