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

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

Issue 1092683004: Manually remove all existing occurences of PrefRegistrySyncable::UNSYNCABLE_PREF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs-add-reg-funcs1
Patch Set: y Created 5 years, 8 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_default_provider.cc
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc
index 39c5a2e24c277066fcc7e47c6aee1f537ef4a3d5..d85a28e0c005a670c0e985f4b7e89faf69d1f432 100644
--- a/components/content_settings/core/browser/content_settings_default_provider.cc
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -12,6 +12,7 @@
#include "base/bind.h"
#include "base/command_line.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 "components/content_settings/core/browser/content_settings_rule.h"
@@ -122,12 +123,12 @@ void DefaultProvider::RegisterProfilePrefs(
// after two stable releases.
for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
ContentSettingsType type = static_cast<ContentSettingsType>(i);
- registry->RegisterIntegerPref(
- GetPrefName(type),
- GetDefaultValue(type),
- IsContentSettingsTypeSyncable(type)
- ? user_prefs::PrefRegistrySyncable::SYNCABLE_PREF
- : user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ if (IsContentSettingsTypeSyncable(type)) {
+ registry->RegisterIntegerPref(GetPrefName(type), GetDefaultValue(type),
+ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ } else {
+ registry->RegisterIntegerPref(GetPrefName(type), GetDefaultValue(type));
+ }
}
// Whether the deprecated dictionary preference has already been migrated

Powered by Google App Engine
This is Rietveld 408576698