Index: chrome/browser/services/gcm/push_messaging_service_impl.cc |
diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc |
index 9d352eb7a0003b0418c788369f825cb161cef3ac..1c09ecdec8431ded5c5a64756dbcdfb6a6ab4f1d 100644 |
--- a/chrome/browser/services/gcm/push_messaging_service_impl.cc |
+++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc |
@@ -30,6 +30,21 @@ namespace gcm { |
namespace { |
const int kMaxRegistrations = 1000000; |
+ |
+static blink::WebPushPermissionStatus ToPushPermission(ContentSetting setting) { |
fgorski
2014/10/29 20:52:44
why static?
Miguel Garcia
2014/10/30 12:27:15
Ok, I removed it. I actually don't know if there i
|
+ switch (setting) { |
+ case CONTENT_SETTING_ALLOW: |
+ return blink::WebPushPermissionStatusGranted; |
+ case CONTENT_SETTING_BLOCK: |
+ return blink::WebPushPermissionStatusDenied; |
+ case CONTENT_SETTING_ASK: |
+ return blink::WebPushPermissionStatusDefault; |
+ default: |
+ NOTREACHED(); |
+ return blink::WebPushPermissionStatusDenied; |
+ } |
+} |
+ |
} // namespace |
// static |
@@ -234,6 +249,31 @@ void PushMessagingServiceImpl::Register( |
callback)); |
} |
+blink::WebPushPermissionStatus PushMessagingServiceImpl::GetPermissionStatus( |
+ const GURL& requesting_origin, |
+ int renderer_id, |
+ int render_frame_id) { |
+ content::RenderFrameHost* render_frame_host = |
+ content::RenderFrameHost::FromID(renderer_id, render_frame_id); |
+ |
+ // The frame doesn't exist any more, or we received a bad frame id. |
+ if (!render_frame_host) |
+ return blink::WebPushPermissionStatusDenied; |
+ |
+ content::WebContents* web_contents = |
+ content::WebContents::FromRenderFrameHost(render_frame_host); |
+ |
+ // The page doesn't exist any more or we got a bad render frame host. |
+ if (!web_contents) |
+ return blink::WebPushPermissionStatusDenied; |
+ |
+ GURL embedder_origin = web_contents->GetLastCommittedURL().GetOrigin(); |
+ gcm::PushMessagingPermissionContext* permission_context = |
+ gcm::PushMessagingPermissionContextFactory::GetForProfile(profile_); |
+ return ToPushPermission( |
+ permission_context->PermissionStatus(requesting_origin, embedder_origin)); |
+} |
+ |
void PushMessagingServiceImpl::RegisterEnd( |
const content::PushMessagingService::RegisterCallback& callback, |
const std::string& registration_id, |
@@ -253,6 +293,8 @@ void PushMessagingServiceImpl::DidRegister( |
const content::PushMessagingService::RegisterCallback& callback, |
const std::string& registration_id, |
GCMClient::Result result) { |
+ LOG(WARNING) << "GCM RETURNED " << result; |
mlamouri (slow - plz ping)
2014/10/29 20:13:33
nit: leftover debugging code?
Miguel Garcia
2014/10/30 12:27:15
Indeed, sorry about that.
|
+ |
content::PushRegistrationStatus status = |
result == GCMClient::SUCCESS |
? content::PUSH_REGISTRATION_STATUS_SUCCESS |