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

Unified Diff: chrome/browser/notifications/notifier_state_tracker.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/notifier_state_tracker.cc
diff --git a/chrome/browser/notifications/notifier_state_tracker.cc b/chrome/browser/notifications/notifier_state_tracker.cc
index 2f0ecc5b01c3d4cfb770b52061a9a107ada95111..6f094080a860a38988d200854d8ee8d89d9d87f3 100644
--- a/chrome/browser/notifications/notifier_state_tracker.cc
+++ b/chrome/browser/notifications/notifier_state_tracker.cc
@@ -12,6 +12,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/content_settings/core/common/content_settings_types.h"
@@ -86,9 +87,10 @@ bool NotifierStateTracker::IsNotifierEnabled(
return disabled_extension_ids_.find(notifier_id.id) ==
disabled_extension_ids_.end();
case NotifierId::WEB_PAGE:
- return PermissionManager::Get(profile_)->GetPermissionStatus(
- CONTENT_SETTINGS_TYPE_NOTIFICATIONS, notifier_id.url,
- notifier_id.url) == blink::mojom::PermissionStatus::GRANTED;
+ return PermissionManager::Get(profile_)
+ ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ notifier_id.url, notifier_id.url)
+ .content_setting == CONTENT_SETTING_ALLOW;
case NotifierId::SYSTEM_COMPONENT:
#if defined(OS_CHROMEOS)
return disabled_system_component_ids_.find(notifier_id.id) ==

Powered by Google App Engine
This is Rietveld 408576698