Chromium Code Reviews| Index: content/browser/push_messaging/push_messaging_message_filter.cc |
| diff --git a/content/browser/push_messaging/push_messaging_message_filter.cc b/content/browser/push_messaging/push_messaging_message_filter.cc |
| index fbece4a438268953da568d7d23427025be445f68..e3547e98cdce423d16a31ea7a74c2fa280743a48 100644 |
| --- a/content/browser/push_messaging/push_messaging_message_filter.cc |
| +++ b/content/browser/push_messaging/push_messaging_message_filter.cc |
| @@ -12,6 +12,7 @@ |
| #include "content/browser/renderer_host/render_process_host_impl.h" |
| #include "content/browser/service_worker/service_worker_context_wrapper.h" |
| #include "content/common/push_messaging_messages.h" |
| +#include "content/common/push_registration_params.h" |
|
mlamouri (slow - plz ping)
2014/12/01 21:05:09
I think you forgot that file.
Peter Beverloo
2014/12/03 15:01:59
It's no longer necessary. Thanks for pointing it o
|
| #include "content/public/browser/browser_context.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/push_messaging_service.h" |
| @@ -52,11 +53,11 @@ bool PushMessagingMessageFilter::OnMessageReceived( |
| return handled; |
| } |
| -void PushMessagingMessageFilter::OnRegister(int render_frame_id, |
| - int callbacks_id, |
| - const std::string& sender_id, |
| - bool user_gesture, |
| - int service_worker_provider_id) { |
| +void PushMessagingMessageFilter::OnRegister( |
| + int render_frame_id, |
| + int callbacks_id, |
| + const PushRegistrationParams& registration_params, |
| + int service_worker_provider_id) { |
| DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| // TODO(mvanouwerkerk): Validate arguments? |
| ServiceWorkerProviderHost* service_worker_host = |
| @@ -79,8 +80,7 @@ void PushMessagingMessageFilter::OnRegister(int render_frame_id, |
| weak_factory_.GetWeakPtr(), |
| render_frame_id, |
| callbacks_id, |
| - sender_id, |
| - user_gesture, |
| + registration_params, |
| service_worker_host->active_version()->scope().GetOrigin(), |
| service_worker_host->active_version()->registration_id())); |
| } |
| @@ -112,8 +112,7 @@ void PushMessagingMessageFilter::OnPermissionStatusRequest( |
| void PushMessagingMessageFilter::DoRegister( |
| int render_frame_id, |
| int callbacks_id, |
| - const std::string& sender_id, |
| - bool user_gesture, |
| + const PushRegistrationParams& registration_params, |
| const GURL& origin, |
| int64 service_worker_registration_id) { |
| DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| @@ -129,10 +128,11 @@ void PushMessagingMessageFilter::DoRegister( |
| } |
| service()->Register(origin, |
| service_worker_registration_id, |
| - sender_id, |
| + registration_params.sender_id, |
| + registration_params.user_visible_only, |
| render_process_id_, |
| render_frame_id, |
| - user_gesture, |
| + registration_params.user_gesture, |
| base::Bind(&PushMessagingMessageFilter::DidRegister, |
| weak_factory_.GetWeakPtr(), |
| render_frame_id, |