Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: chrome/browser/push_messaging/push_messaging_permission_context.cc

Issue 1478433002: Permissions: Move common logic from DecidePermission to RequestPermission (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@innoinherit
Patch Set: Rebase / git cl format Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/push_messaging/push_messaging_permission_context.cc
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc
index ab2194a3e2a234519da78cd375c7ba5c3251a23e..7bf8cfebc31d6fd19beaca8b339f2bd2553861cf 100644
--- a/chrome/browser/push_messaging/push_messaging_permission_context.cc
+++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc
@@ -65,7 +65,7 @@ ContentSetting PushMessagingPermissionContext::GetPermissionStatus(
// - You need to request it from a top level domain
// - You need to have notification permission granted.
// - You need to not have push permission explicitly blocked.
-// - If those two things are true it is granted without prompting.
+// - If those 3 things are true it is granted without prompting.
// This is done to avoid double prompting for notifications and push.
void PushMessagingPermissionContext::DecidePermission(
content::WebContents* web_contents,
@@ -82,13 +82,6 @@ void PushMessagingPermissionContext::DecidePermission(
return;
}
- if (IsRestrictedToSecureOrigins() &&
- !content::IsOriginSecure(requesting_origin)) {
- NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
- false /* persist */, CONTENT_SETTING_BLOCK);
- return;
- }
-
NotificationPermissionContext* notification_context =
NotificationPermissionContextFactory::GetForProfile(profile_);
DCHECK(notification_context);

Powered by Google App Engine
This is Rietveld 408576698