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

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

Issue 2020063003: Use GetPermissionStatus instead of DesktopNotificationProfileUtil::GetContentSetting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove embber param for notifications Created 4 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/notifier_state_tracker.cc
diff --git a/chrome/browser/notifications/notifier_state_tracker.cc b/chrome/browser/notifications/notifier_state_tracker.cc
index dcf9015e97713433d8698d14df57b97239239e5d..9eeb586266a1ddd035824a77fbba734432e6ceb7 100644
--- a/chrome/browser/notifications/notifier_state_tracker.cc
+++ b/chrome/browser/notifications/notifier_state_tracker.cc
@@ -11,11 +11,12 @@
#include "base/bind.h"
#include "base/values.h"
#include "build/build_config.h"
-#include "chrome/browser/notifications/desktop_notification_profile_util.h"
+#include "chrome/browser/permissions/permission_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/scoped_user_pref_update.h"
+#include "content/public/browser/permission_type.h"
#include "ui/message_center/notifier_settings.h"
#if defined(ENABLE_EXTENSIONS)
@@ -84,8 +85,9 @@ bool NotifierStateTracker::IsNotifierEnabled(
return disabled_extension_ids_.find(notifier_id.id) ==
disabled_extension_ids_.end();
case NotifierId::WEB_PAGE:
- return DesktopNotificationProfileUtil::GetContentSetting(
- profile_, notifier_id.url) == CONTENT_SETTING_ALLOW;
+ return PermissionManager::Get(profile_)->GetPermissionStatus(
+ content::PermissionType::NOTIFICATIONS, notifier_id.url,
+ notifier_id.url) == blink::mojom::PermissionStatus::GRANTED;
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