| 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/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" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 } | 83 } |
| 84 | 84 |
| 85 void PushMessagingDispatcher::OnSubscribeFromDocumentSuccess( | 85 void PushMessagingDispatcher::OnSubscribeFromDocumentSuccess( |
| 86 int32_t request_id, | 86 int32_t request_id, |
| 87 const GURL& endpoint, | 87 const GURL& endpoint, |
| 88 const std::vector<uint8_t>& curve25519dh) { | 88 const std::vector<uint8_t>& curve25519dh) { |
| 89 blink::WebPushSubscriptionCallbacks* callbacks = | 89 blink::WebPushSubscriptionCallbacks* callbacks = |
| 90 subscription_callbacks_.Lookup(request_id); | 90 subscription_callbacks_.Lookup(request_id); |
| 91 DCHECK(callbacks); | 91 DCHECK(callbacks); |
| 92 | 92 |
| 93 scoped_ptr<blink::WebPushSubscription> subscription( | 93 callbacks->onSuccess(blink::adoptWebPtr( |
| 94 new blink::WebPushSubscription(endpoint, curve25519dh)); | 94 new blink::WebPushSubscription(endpoint, curve25519dh))); |
| 95 callbacks->onSuccess(subscription.release()); | |
| 96 | 95 |
| 97 subscription_callbacks_.Remove(request_id); | 96 subscription_callbacks_.Remove(request_id); |
| 98 } | 97 } |
| 99 | 98 |
| 100 void PushMessagingDispatcher::OnSubscribeFromDocumentError( | 99 void PushMessagingDispatcher::OnSubscribeFromDocumentError( |
| 101 int32_t request_id, | 100 int32_t request_id, |
| 102 PushRegistrationStatus status) { | 101 PushRegistrationStatus status) { |
| 103 blink::WebPushSubscriptionCallbacks* callbacks = | 102 blink::WebPushSubscriptionCallbacks* callbacks = |
| 104 subscription_callbacks_.Lookup(request_id); | 103 subscription_callbacks_.Lookup(request_id); |
| 105 DCHECK(callbacks); | 104 DCHECK(callbacks); |
| 106 | 105 |
| 107 scoped_ptr<blink::WebPushError> error(new blink::WebPushError( | 106 callbacks->onError(blink::WebPushError( |
| 108 blink::WebPushError::ErrorTypeAbort, | 107 blink::WebPushError::ErrorTypeAbort, |
| 109 blink::WebString::fromUTF8(PushRegistrationStatusToString(status)))); | 108 blink::WebString::fromUTF8(PushRegistrationStatusToString(status)))); |
| 110 callbacks->onError(error.release()); | |
| 111 | 109 |
| 112 subscription_callbacks_.Remove(request_id); | 110 subscription_callbacks_.Remove(request_id); |
| 113 } | 111 } |
| 114 | 112 |
| 115 } // namespace content | 113 } // namespace content |
| OLD | NEW |