| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>( | 61 int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>( |
| 62 service_worker_provider)->provider_id(); | 62 service_worker_provider)->provider_id(); |
| 63 | 63 |
| 64 std::string sender_id = manifest.gcm_sender_id.is_null() | 64 std::string sender_id = manifest.gcm_sender_id.is_null() |
| 65 ? std::string() : base::UTF16ToUTF8(manifest.gcm_sender_id.string()); | 65 ? std::string() : base::UTF16ToUTF8(manifest.gcm_sender_id.string()); |
| 66 if (sender_id.empty()) { | 66 if (sender_id.empty()) { |
| 67 OnRegisterError(callbacks_id, PUSH_REGISTRATION_STATUS_NO_SENDER_ID); | 67 OnRegisterError(callbacks_id, PUSH_REGISTRATION_STATUS_NO_SENDER_ID); |
| 68 return; | 68 return; |
| 69 } | 69 } |
| 70 | 70 |
| 71 PushRegistrationParams params; |
| 72 params.sender_id = manifest.gcm_sender_id.is_null() |
| 73 ? std::string() : base::UTF16ToUTF8(manifest.gcm_sender_id.string()); |
| 74 params.user_visible_only = manifest.gcm_user_visible_only; |
| 75 params.user_gesture = |
| 76 blink::WebUserGestureIndicator::isProcessingUserGesture(); |
| 77 |
| 71 Send(new PushMessagingHostMsg_Register( | 78 Send(new PushMessagingHostMsg_Register( |
| 72 routing_id(), | 79 routing_id(), |
| 73 callbacks_id, | 80 callbacks_id, |
| 74 manifest.gcm_sender_id.is_null() | 81 params, |
| 75 ? std::string() | |
| 76 : base::UTF16ToUTF8(manifest.gcm_sender_id.string()), | |
| 77 blink::WebUserGestureIndicator::isProcessingUserGesture(), | |
| 78 service_worker_provider_id)); | 82 service_worker_provider_id)); |
| 79 } | 83 } |
| 80 | 84 |
| 81 void PushMessagingDispatcher::getPermissionStatus( | 85 void PushMessagingDispatcher::getPermissionStatus( |
| 82 blink::WebPushPermissionStatusCallback* callback, | 86 blink::WebPushPermissionStatusCallback* callback, |
| 83 blink::WebServiceWorkerProvider* service_worker_provider) { | 87 blink::WebServiceWorkerProvider* service_worker_provider) { |
| 84 DCHECK(callback); | 88 DCHECK(callback); |
| 85 int permission_callback_id = permission_check_callbacks_.Add(callback); | 89 int permission_callback_id = permission_check_callbacks_.Add(callback); |
| 86 int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>( | 90 int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>( |
| 87 service_worker_provider)->provider_id(); | 91 service_worker_provider)->provider_id(); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 | 134 |
| 131 void PushMessagingDispatcher::OnPermissionStatusFailure(int32 callback_id) { | 135 void PushMessagingDispatcher::OnPermissionStatusFailure(int32 callback_id) { |
| 132 blink::WebPushPermissionStatusCallback* callback = | 136 blink::WebPushPermissionStatusCallback* callback = |
| 133 permission_check_callbacks_.Lookup(callback_id); | 137 permission_check_callbacks_.Lookup(callback_id); |
| 134 DCHECK(callback); | 138 DCHECK(callback); |
| 135 callback->onError(); | 139 callback->onError(); |
| 136 permission_check_callbacks_.Remove(callback_id); | 140 permission_check_callbacks_.Remove(callback_id); |
| 137 } | 141 } |
| 138 | 142 |
| 139 } // namespace content | 143 } // namespace content |
| OLD | NEW |