| 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_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_provider_impl.h" | 8 #include "content/child/service_worker/web_service_worker_provider_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" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 bool handled = true; | 31 bool handled = true; |
| 32 IPC_BEGIN_MESSAGE_MAP(PushMessagingDispatcher, message) | 32 IPC_BEGIN_MESSAGE_MAP(PushMessagingDispatcher, message) |
| 33 IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterSuccess, OnRegisterSuccess) | 33 IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterSuccess, OnRegisterSuccess) |
| 34 IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterError, OnRegisterError) | 34 IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterError, OnRegisterError) |
| 35 IPC_MESSAGE_UNHANDLED(handled = false) | 35 IPC_MESSAGE_UNHANDLED(handled = false) |
| 36 IPC_END_MESSAGE_MAP() | 36 IPC_END_MESSAGE_MAP() |
| 37 return handled; | 37 return handled; |
| 38 } | 38 } |
| 39 | 39 |
| 40 void PushMessagingDispatcher::registerPushMessaging( | 40 void PushMessagingDispatcher::registerPushMessaging( |
| 41 const WebString& sender_id, | |
| 42 blink::WebPushRegistrationCallbacks* callbacks, | |
| 43 blink::WebServiceWorkerProvider* service_worker_provider) { | |
| 44 registerPushMessaging(callbacks, service_worker_provider); | |
| 45 } | |
| 46 | |
| 47 void PushMessagingDispatcher::registerPushMessaging( | |
| 48 blink::WebPushRegistrationCallbacks* callbacks, | 41 blink::WebPushRegistrationCallbacks* callbacks, |
| 49 blink::WebServiceWorkerProvider* service_worker_provider) { | 42 blink::WebServiceWorkerProvider* service_worker_provider) { |
| 50 RenderFrameImpl::FromRoutingID(routing_id())->manifest_manager()->GetManifest( | 43 RenderFrameImpl::FromRoutingID(routing_id())->manifest_manager()->GetManifest( |
| 51 base::Bind(&PushMessagingDispatcher::DoRegister, | 44 base::Bind(&PushMessagingDispatcher::DoRegister, |
| 52 base::Unretained(this), | 45 base::Unretained(this), |
| 53 callbacks, | 46 callbacks, |
| 54 service_worker_provider)); | 47 service_worker_provider)); |
| 55 } | 48 } |
| 56 | 49 |
| 57 void PushMessagingDispatcher::DoRegister( | 50 void PushMessagingDispatcher::DoRegister( |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 CHECK(callbacks); | 88 CHECK(callbacks); |
| 96 | 89 |
| 97 scoped_ptr<blink::WebPushError> error(new blink::WebPushError( | 90 scoped_ptr<blink::WebPushError> error(new blink::WebPushError( |
| 98 blink::WebPushError::ErrorTypeAbort, | 91 blink::WebPushError::ErrorTypeAbort, |
| 99 WebString::fromUTF8(PushRegistrationStatusToString(status)))); | 92 WebString::fromUTF8(PushRegistrationStatusToString(status)))); |
| 100 callbacks->onError(error.release()); | 93 callbacks->onError(error.release()); |
| 101 registration_callbacks_.Remove(callbacks_id); | 94 registration_callbacks_.Remove(callbacks_id); |
| 102 } | 95 } |
| 103 | 96 |
| 104 } // namespace content | 97 } // namespace content |
| OLD | NEW |