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

Unified Diff: chrome/browser/engagement/site_engagement_service.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: ps Created 3 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/engagement/site_engagement_service.cc
diff --git a/chrome/browser/engagement/site_engagement_service.cc b/chrome/browser/engagement/site_engagement_service.cc
index cd287187c009fc6e4ae276afdff4fe12a7bd5c63..275429db02b82cea3d331d68f06d927f11ad73e6 100644
--- a/chrome/browser/engagement/site_engagement_service.cc
+++ b/chrome/browser/engagement/site_engagement_service.cc
@@ -29,6 +29,7 @@
#include "chrome/common/pref_names.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "components/content_settings/core/common/content_settings_utils.h"
#include "components/history/core/browser/history_service.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
@@ -75,8 +76,10 @@ std::set<GURL> GetEngagementOriginsFromContentSettings(Profile* profile) {
// Fetch URLs of sites for which notifications are allowed.
for (const auto& site : GetContentSettingsFromProfile(
profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)) {
- if (site.setting != CONTENT_SETTING_ALLOW)
+ if (content_settings::ValueToContentSetting(site.setting_value.get()) !=
+ CONTENT_SETTING_ALLOW) {
continue;
+ }
urls.insert(GURL(site.primary_pattern.ToString()));
}

Powered by Google App Engine
This is Rietveld 408576698