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

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

Issue 2816723002: Add "Site Settings" option to Clear Browsing Data on Android (Closed)
Patch Set: fix deps Created 3 years, 7 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_pref.cc
diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc
index d1bf46e76870dada2ee05345f854880287831167..edd845d227b08bea960198baadac99815152e6be 100644
--- a/components/content_settings/core/browser/content_settings_pref.cc
+++ b/components/content_settings/core/browser/content_settings_pref.cc
@@ -74,14 +74,12 @@ ContentSettingsPref::ContentSettingsPref(
PrefChangeRegistrar* registrar,
const std::string& pref_name,
bool incognito,
- bool store_last_modified,
NotifyObserversCallback notify_callback)
: content_type_(content_type),
prefs_(prefs),
registrar_(registrar),
pref_name_(pref_name),
is_incognito_(incognito),
- store_last_modified_(store_last_modified),
updating_preferences_(false),
notify_callback_(notify_callback) {
DCHECK(prefs_);
@@ -110,6 +108,7 @@ bool ContentSettingsPref::SetWebsiteSetting(
const ContentSettingsPattern& primary_pattern,
const ContentSettingsPattern& secondary_pattern,
const ResourceIdentifier& resource_identifier,
+ base::Time modified_time,
base::Value* in_value) {
DCHECK(!in_value || IsValueAllowedForType(in_value, content_type_));
DCHECK(thread_checker_.CalledOnValidThread());
@@ -126,9 +125,6 @@ bool ContentSettingsPref::SetWebsiteSetting(
if (!is_incognito_)
map_to_modify = &value_map_;
- base::Time modified_time =
- store_last_modified_ ? base::Time::Now() : base::Time();
-
{
base::AutoLock auto_lock(lock_);
if (value.get()) {

Powered by Google App Engine
This is Rietveld 408576698