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

Unified Diff: components/content_settings/core/browser/host_content_settings_map.cc

Issue 2812113004: Write last_modified date to Content Settings in the PrefProvider (Closed)
Patch Set: Fix Android compilation Created 3 years, 8 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: components/content_settings/core/browser/host_content_settings_map.cc
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 3879f3096c0b32f26bb8077fd333adb59a9e1e78..0657bfc066c02f5cf56269419469578492fd2698 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -194,8 +194,8 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
base::WrapUnique(policy_provider);
policy_provider->AddObserver(this);
- pref_provider_ =
- new content_settings::PrefProvider(prefs_, is_incognito_);
+ pref_provider_ = new content_settings::PrefProvider(prefs_, is_incognito_,
+ kStoreLastModified);
content_settings_providers_[PREF_PROVIDER] = base::WrapUnique(pref_provider_);
pref_provider_->AddObserver(this);
@@ -659,8 +659,8 @@ void HostContentSettingsMap::ClearSettingsForOneType(
void HostContentSettingsMap::ClearSettingsForOneTypeWithPredicate(
ContentSettingsType content_type,
const base::Callback<bool(const ContentSettingsPattern& primary_pattern,
- const ContentSettingsPattern& secondary_pattern)>&
- pattern_predicate) {
+ const ContentSettingsPattern& secondary_pattern,
+ base::Time last_modified)>& pattern_predicate) {
if (pattern_predicate.is_null()) {
ClearSettingsForOneType(content_type);
return;
@@ -670,7 +670,8 @@ void HostContentSettingsMap::ClearSettingsForOneTypeWithPredicate(
GetSettingsForOneType(content_type, std::string(), &settings);
for (const ContentSettingPatternSource& setting : settings) {
if (pattern_predicate.Run(setting.primary_pattern,
- setting.secondary_pattern)) {
+ setting.secondary_pattern,
+ setting.last_modified)) {
SetWebsiteSettingCustomScope(setting.primary_pattern,
setting.secondary_pattern, content_type,
std::string(), nullptr);
@@ -760,6 +761,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
}
settings->push_back(ContentSettingPatternSource(
rule.primary_pattern, rule.secondary_pattern, setting_value,
+ rule.last_modified,
kProviderNamesSourceMap[provider_type].provider_name, incognito));
}
}

Powered by Google App Engine
This is Rietveld 408576698