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

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

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: really fix build? Created 3 years, 10 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/platform_notification_service_impl.cc
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
index a3b208c932080984a698579a650e8064642d0467..77b5174a13a141072986b1d07e8c9ddc9d9741f6 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -227,8 +227,14 @@ PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
}
#endif
- return PermissionManager::Get(profile)->GetPermissionStatus(
+ ContentSetting setting = PermissionManager::Get(profile)->GetPermissionStatus(
CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin);
+ if (setting == CONTENT_SETTING_ALLOW)
+ return blink::mojom::PermissionStatus::GRANTED;
+ if (setting == CONTENT_SETTING_ASK)
+ return blink::mojom::PermissionStatus::ASK;
+ DCHECK_EQ(setting, CONTENT_SETTING_BLOCK);
raymes 2017/02/28 01:37:34 nit: swap the param order
Timothy Loh 2017/02/28 04:02:46 Done.
+ return blink::mojom::PermissionStatus::DENIED;
}
blink::mojom::PermissionStatus

Powered by Google App Engine
This is Rietveld 408576698