Implement PushManager#hasPermission

content/browser/push_messaging_message_filter.cc

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 b681ce7b392d7314eceda446aa8c96aafd37cf48..b5f1f265f9df8066293292c9e52e477a6c71b0c1 100644
--- a/content/browser/push_messaging_message_filter.cc
+++ b/content/browser/push_messaging_message_filter.cc
@@ -15,6 +15,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/WebPushPermissionStatus.h"
 
 namespace content {
 namespace {
@@ -44,6 +45,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;
@@ -82,6 +85,27 @@ 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) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  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()) {

[Michael van Ouwerkerk, 2014/10/24 12:36:08]

What if this is false? You'd leave the promise hanging forever. The web page may
be spinning, the layout test is timing out. Please reject it instead. Really
this is an edge case we should not be hitting, but might as well handle it the
best we can.

[Miguel Garcia, 2014/10/29 18:32:03]

Done.

+    BrowserThread::PostTask(
+        BrowserThread::UI,
+        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,
@@ -129,6 +153,18 @@ void PushMessagingMessageFilter::DidRegister(
   RecordRegistrationStatus(status);
 }
 
+void PushMessagingMessageFilter::DoPermissionStatus(
+    const GURL& requesting_origin,
+    int render_frame_id, int callback_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  blink::WebPushPermissionStatus permission_value =
+      service()->GetPermissionStatus(requesting_origin, render_process_id_,
+                                     render_frame_id);
+
+  Send(new PushMessagingMsg_PermissionStatusResult(
+      render_frame_id, callback_id, permission_value));
+}
+
 PushMessagingService* PushMessagingMessageFilter::service() {
   if (!service_) {
     RenderProcessHost* process_host =