Index: content/browser/push_messaging_message_filter.cc |
diff --git a/content/browser/push_messaging_message_filter.cc b/content/browser/push_messaging_message_filter.cc |
index 01193c14a34d554fc5024f06ff7a5475a4bcedc0..ec28c72d4532715b2ac59d85a329cc9c5d02f992 100644 |
--- a/content/browser/push_messaging_message_filter.cc |
+++ b/content/browser/push_messaging_message_filter.cc |
@@ -14,6 +14,7 @@ |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/push_messaging_service.h" |
+#include "third_party/WebKit/public/platform/WebPushPermissionCallback.h" |
namespace content { |
@@ -34,6 +35,8 @@ bool PushMessagingMessageFilter::OnMessageReceived( |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(PushMessagingMessageFilter, message) |
IPC_MESSAGE_HANDLER(PushMessagingHostMsg_Register, OnRegister) |
+ IPC_MESSAGE_HANDLER(PushMessagingHostMsg_PermissionStatus, |
+ OnPermissionStatus) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
@@ -69,6 +72,26 @@ void PushMessagingMessageFilter::OnRegister(int render_frame_id, |
service_worker_host->active_version()->registration_id())); |
} |
+void PushMessagingMessageFilter::OnPermissionStatus( |
+ int render_frame_id, |
+ int service_worker_provider_id, |
+ int permission_callback_id) { |
+ ServiceWorkerProviderHost* service_worker_host = |
+ service_worker_context_->context()->GetProviderHost( |
+ render_process_id_, service_worker_provider_id); |
+ |
+ if (service_worker_host && service_worker_host->active_version()) { |
+ BrowserThread::PostTask( |
+ BrowserThread::UI, |
mlamouri (slow - plz ping)
2014/10/16 09:04:57
Could you use BrowserMessageFilter::OverrideThread
Miguel Garcia
2014/10/16 13:50:26
That actually sounds pretty cool (and I didn't kno
|
+ FROM_HERE, |
+ base::Bind(&PushMessagingMessageFilter::DoPermissionStatus, |
+ weak_factory_.GetWeakPtr(), |
+ service_worker_host->active_version()->scope().GetOrigin(), |
+ render_frame_id, |
+ permission_callback_id)); |
+ } |
+} |
+ |
void PushMessagingMessageFilter::DoRegister( |
int render_frame_id, |
int callbacks_id, |
@@ -112,6 +135,17 @@ void PushMessagingMessageFilter::DidRegister( |
} |
} |
+void PushMessagingMessageFilter::DoPermissionStatus( |
+ const GURL& requesting_origin, |
+ int render_frame_id, int callback_id) { |
+ blink::WebPushPermissionCallback::PushPermissionStatus permission_value = |
+ service()->PermissionStatus(requesting_origin, render_process_id_, |
+ render_frame_id); |
mlamouri (slow - plz ping)
2014/10/16 09:04:57
nit: indent
Miguel Garcia
2014/10/16 13:50:26
Done.
|
+ |
+ Send(new PushMessagingMsg_PermissionStatusResult( |
+ render_frame_id, callback_id, permission_value)); |
+} |
+ |
PushMessagingService* PushMessagingMessageFilter::service() { |
if (!service_) { |
RenderProcessHost* process_host = |