| Index: components/content_settings/core/browser/content_settings_pref_provider.cc
|
| diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
|
| index 43738618351c6995cda3dc7c58269c655f3fc680..993fa3b99d1a0c7cec82054a66a208f5349e2104 100644
|
| --- a/components/content_settings/core/browser/content_settings_pref_provider.cc
|
| +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
|
| @@ -80,9 +80,10 @@ void PrefProvider::RegisterProfilePrefs(
|
| #endif // !defined(OS_IOS)
|
| }
|
|
|
| -PrefProvider::PrefProvider(PrefService* prefs, bool incognito)
|
| - : prefs_(prefs),
|
| - is_incognito_(incognito) {
|
| +PrefProvider::PrefProvider(PrefService* prefs,
|
| + bool incognito,
|
| + bool store_last_modified)
|
| + : prefs_(prefs), is_incognito_(incognito) {
|
| DCHECK(prefs_);
|
| // Verify preferences version.
|
| if (!prefs_->HasPrefPath(prefs::kContentSettingsVersion)) {
|
| @@ -105,7 +106,7 @@ PrefProvider::PrefProvider(PrefService* prefs, bool incognito)
|
| info->type(),
|
| base::MakeUnique<ContentSettingsPref>(
|
| info->type(), prefs_, &pref_change_registrar_, info->pref_name(),
|
| - is_incognito_,
|
| + is_incognito_, store_last_modified,
|
| base::Bind(&PrefProvider::Notify, base::Unretained(this)))));
|
| }
|
|
|
| @@ -155,6 +156,19 @@ bool PrefProvider::SetWebsiteSetting(
|
| resource_identifier, in_value);
|
| }
|
|
|
| +void PrefProvider::DeleteWebsiteSettingAfterDate(
|
| + const ContentSettingsPattern& primary_pattern,
|
| + const ContentSettingsPattern& secondary_pattern,
|
| + ContentSettingsType content_type,
|
| + base::Time begin_time) {
|
| + DCHECK(CalledOnValidThread());
|
| + DCHECK(prefs_);
|
| +
|
| + return GetPref(content_type)
|
| + ->DeleteWebsiteSettingAfterDate(primary_pattern, secondary_pattern,
|
| + begin_time);
|
| +}
|
| +
|
| void PrefProvider::ClearAllContentSettingsRules(
|
| ContentSettingsType content_type) {
|
| DCHECK(CalledOnValidThread());
|
|
|