summaryrefslogtreecommitdiffstats
path: root/components/content_settings/core/browser/content_settings_pref_provider.cc
diff options
context:
space:
mode:
Diffstat (limited to 'components/content_settings/core/browser/content_settings_pref_provider.cc')
-rw-r--r--components/content_settings/core/browser/content_settings_pref_provider.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
index 0b56355..2319578 100644
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -13,6 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/metrics/histogram.h"
+#include "base/prefs/pref_registry.h"
#include "base/prefs/pref_service.h"
#include "base/prefs/scoped_user_pref_update.h"
#include "base/strings/string_split.h"
@@ -120,12 +121,12 @@ void PrefProvider::RegisterProfilePrefs(
false);
for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
- registry->RegisterDictionaryPref(
- kContentSettingsExceptionsPrefs[i],
- IsContentSettingsTypeSyncable(ContentSettingsType(i))
- ? user_prefs::PrefRegistrySyncable::SYNCABLE_PREF
- : user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF
- );
+ if (IsContentSettingsTypeSyncable(ContentSettingsType(i))) {
+ registry->RegisterDictionaryPref(kContentSettingsExceptionsPrefs[i],
+ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ } else {
+ registry->RegisterDictionaryPref(kContentSettingsExceptionsPrefs[i]);
+ }
}
}