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/host_content_settings_map.cc

Issue 2158743002: Register a pref to control migration status (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@change_scoping_type
Patch Set: add some comments Created 4 years, 5 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 015705ebc8ea9a38646b344a50006d6e06ead63b..e5ebc789aea4f9638be14ef17ccf9112892badf8 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -169,7 +169,14 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
content_settings_providers_[DEFAULT_PROVIDER] = default_provider;
MigrateKeygenSettings();
- MigrateDomainScopedSettings();
+
+ if (prefs_->GetInteger(prefs::kContentSettingsMigrationStatus) ==
+ content_settings::NOT_MIGRATED) {
+ MigrateDomainScopedSettings();
+ prefs_->SetInteger(prefs::kContentSettingsMigrationStatus,
+ content_settings::DONE_IN_HCSM);
+ }
+
RecordNumberOfExceptions();
}
@@ -180,6 +187,8 @@ void HostContentSettingsMap::RegisterProfilePrefs(
content_settings::ContentSettingsRegistry::GetInstance();
registry->RegisterIntegerPref(prefs::kContentSettingsWindowLastTabIndex, 0);
+ registry->RegisterIntegerPref(prefs::kContentSettingsMigrationStatus,
+ content_settings::NOT_MIGRATED);
// Register the prefs for the content settings providers.
content_settings::DefaultProvider::RegisterProfilePrefs(registry);

Powered by Google App Engine
This is Rietveld 408576698