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

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider.cc

Issue 7740011: Don't sync or migrate obsolete preferences in the incognito host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_pref_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index fcc9f19121e3ac3c24160776d20d484ebe71a257..37f60c1fd50a52a961af2375517afed99094a2e2 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -563,18 +563,20 @@ void PrefProvider::Observe(
if (updating_preferences_)
return;
- AutoReset<bool> auto_reset(&updating_preferences_, true);
- std::string* name = Details<std::string>(details).ptr();
- if (*name == prefs::kContentSettingsPatternPairs) {
- SyncObsoletePatternPref();
- SyncObsoleteGeolocationPref();
- } else if (*name == prefs::kContentSettingsPatterns) {
- MigrateObsoleteContentSettingsPatternPref();
- } else if (*name == prefs::kGeolocationContentSettings) {
- MigrateObsoleteGeolocationPref();
- } else {
- NOTREACHED() << "Unexpected preference observed";
- return;
+ if (!is_incognito_) {
+ AutoReset<bool> auto_reset(&updating_preferences_, true);
+ std::string* name = Details<std::string>(details).ptr();
+ if (*name == prefs::kContentSettingsPatternPairs) {
+ SyncObsoletePatternPref();
+ SyncObsoleteGeolocationPref();
+ } else if (*name == prefs::kContentSettingsPatterns) {
+ MigrateObsoleteContentSettingsPatternPref();
+ } else if (*name == prefs::kGeolocationContentSettings) {
+ MigrateObsoleteGeolocationPref();
+ } else {
+ NOTREACHED() << "Unexpected preference observed";
+ return;
+ }
}
ReadContentSettingsFromPref(true);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698