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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more 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
« no previous file with comments | « chrome/browser/notifications/notification_permission_infobar_delegate.cc ('k') | chrome/browser/notifications/platform_notification_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9e3180d1d4a123d8ef85ca7ffe5fc1fb8add175a..2f0ecc5b01c3d4cfb770b52061a9a107ada95111 100644
--- a/chrome/browser/notifications/notifier_state_tracker.cc
+++ b/chrome/browser/notifications/notifier_state_tracker.cc
@@ -14,9 +14,9 @@
#include "chrome/browser/permissions/permission_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
+#include "components/content_settings/core/common/content_settings_types.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 "extensions/features/features.h"
#include "ui/message_center/notifier_settings.h"
@@ -87,7 +87,7 @@ bool NotifierStateTracker::IsNotifierEnabled(
disabled_extension_ids_.end();
case NotifierId::WEB_PAGE:
return PermissionManager::Get(profile_)->GetPermissionStatus(
- content::PermissionType::NOTIFICATIONS, notifier_id.url,
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, notifier_id.url,
notifier_id.url) == blink::mojom::PermissionStatus::GRANTED;
case NotifierId::SYSTEM_COMPONENT:
#if defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/notifications/notification_permission_infobar_delegate.cc ('k') | chrome/browser/notifications/platform_notification_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698