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

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

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: maybe fix android compile + address comments + basic tests 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..6c70a2ced43d75a2728f84068b6f68685dfc4d7c 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/notifications/notification_object_proxy.h"
#include "chrome/browser/notifications/persistent_notification_delegate.h"
#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/profiles/profile_io_data.h"
@@ -227,8 +228,17 @@ PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
}
#endif
- return PermissionManager::Get(profile)->GetPermissionStatus(
- CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin);
+ ContentSetting setting =
+ PermissionManager::Get(profile)
+ ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin,
+ origin)
+ .content_setting;
+ if (setting == CONTENT_SETTING_ALLOW)
+ return blink::mojom::PermissionStatus::GRANTED;
+ if (setting == CONTENT_SETTING_ASK)
+ return blink::mojom::PermissionStatus::ASK;
+ DCHECK_EQ(CONTENT_SETTING_BLOCK, setting);
+ return blink::mojom::PermissionStatus::DENIED;
}
blink::mojom::PermissionStatus

Powered by Google App Engine
This is Rietveld 408576698