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

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

Issue 2812113004: Write last_modified date to Content Settings in the PrefProvider (Closed)
Patch Set: rebase 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/content_settings_policy_provider.cc
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc
index c2967aa41a68010245b9793394eef5705b3f06b6..3923d0f6ab32282782b9f410a6f8178b67fa77f9 100644
--- a/components/content_settings/core/browser/content_settings_policy_provider.cc
+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc
@@ -235,9 +235,10 @@ void PolicyProvider::GetContentSettingsFromPreferences(
VLOG_IF(2, !pattern_pair.second.IsValid())
<< "Replacing invalid secondary pattern '"
<< pattern_pair.second.ToString() << "' with wildcard";
+ // Don't set a timestamp for policy settings.
value_map->SetValue(
pattern_pair.first, secondary_pattern, content_type,
- ResourceIdentifier(),
+ ResourceIdentifier(), base::Time(),
new base::Value(kPrefsForManagedContentSettingsMap[i].setting));
}
}
@@ -319,11 +320,10 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(
// Don't pass removed values from |value|, because base::Values read with
// JSONReader use a shared string buffer. Instead, DeepCopy here.
- value_map->SetValue(pattern,
- ContentSettingsPattern::Wildcard(),
+ // Don't set a timestamp for policy settings.
+ value_map->SetValue(pattern, ContentSettingsPattern::Wildcard(),
CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
- std::string(),
- cert_filter->DeepCopy());
+ std::string(), base::Time(), cert_filter->DeepCopy());
}
}
@@ -356,9 +356,10 @@ void PolicyProvider::UpdateManagedDefaultSetting(
ContentSettingsPattern::Wildcard(),
entry.content_type, std::string());
} else {
+ // Don't set a timestamp for policy settings.
value_map_.SetValue(ContentSettingsPattern::Wildcard(),
ContentSettingsPattern::Wildcard(), entry.content_type,
- std::string(), new base::Value(setting));
+ std::string(), base::Time(), new base::Value(setting));
}
}

Powered by Google App Engine
This is Rietveld 408576698