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

Unified Diff: chrome/browser/notifications/notification_permission_context.cc

Issue 2945243002: Permissions: Allow PermissionManager to return more PermissionStatusSources.
Patch Set: Cleanup. Created 3 years, 6 months 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/notifications/notification_permission_context.cc
diff --git a/chrome/browser/notifications/notification_permission_context.cc b/chrome/browser/notifications/notification_permission_context.cc
index a159d6999e9325b09c3bdc11b20b29ade7cd2ae5..67a870e31261c0b6df8dc10bca19bf36e7e1e170 100644
--- a/chrome/browser/notifications/notification_permission_context.cc
+++ b/chrome/browser/notifications/notification_permission_context.cc
@@ -169,14 +169,15 @@ NotificationPermissionContext::NotificationPermissionContext(
NotificationPermissionContext::~NotificationPermissionContext() {}
-ContentSetting NotificationPermissionContext::GetPermissionStatusInternal(
+PermissionResult NotificationPermissionContext::GetPermissionStatusInternal(
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
const GURL& embedding_origin) const {
// Push messaging is only allowed to be granted on top-level origins.
if (content_settings_type() == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING
&& requesting_origin != embedding_origin) {
- return CONTENT_SETTING_BLOCK;
+ return PermissionResult(CONTENT_SETTING_BLOCK,
+ PermissionStatusSource::UNSPECIFIED);
}
return PermissionContextBase::GetPermissionStatusInternal(
« no previous file with comments | « chrome/browser/notifications/notification_permission_context.h ('k') | chrome/browser/permissions/permission_context_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698