| 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);
|
|
|
|
|