Index: components/content_settings/core/browser/content_settings_policy_provider.cc |
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc |
index 8c65dbd0ce54721f2b8263cf49bfd450539fa15e..a398a6c0d426637497f4c66e64453c6098fd4725 100644 |
--- a/components/content_settings/core/browser/content_settings_policy_provider.cc |
+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc |
@@ -122,68 +122,38 @@ namespace content_settings { |
// static |
void PolicyProvider::RegisterProfilePrefs( |
user_prefs::PrefRegistrySyncable* registry) { |
- registry->RegisterListPref(prefs::kManagedAutoSelectCertificateForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedCookiesAllowedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedCookiesBlockedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedCookiesSessionOnlyForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedImagesAllowedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedImagesBlockedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedJavaScriptAllowedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedJavaScriptBlockedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedPluginsAllowedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedPluginsBlockedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedPopupsAllowedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedPopupsBlockedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedNotificationsAllowedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterListPref(prefs::kManagedNotificationsBlockedForUrls, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry->RegisterListPref(prefs::kManagedAutoSelectCertificateForUrls); |
+ registry->RegisterListPref(prefs::kManagedCookiesAllowedForUrls); |
+ registry->RegisterListPref(prefs::kManagedCookiesBlockedForUrls); |
+ registry->RegisterListPref(prefs::kManagedCookiesSessionOnlyForUrls); |
+ registry->RegisterListPref(prefs::kManagedImagesAllowedForUrls); |
+ registry->RegisterListPref(prefs::kManagedImagesBlockedForUrls); |
+ registry->RegisterListPref(prefs::kManagedJavaScriptAllowedForUrls); |
+ registry->RegisterListPref(prefs::kManagedJavaScriptBlockedForUrls); |
+ registry->RegisterListPref(prefs::kManagedPluginsAllowedForUrls); |
+ registry->RegisterListPref(prefs::kManagedPluginsBlockedForUrls); |
+ registry->RegisterListPref(prefs::kManagedPopupsAllowedForUrls); |
+ registry->RegisterListPref(prefs::kManagedPopupsBlockedForUrls); |
+ registry->RegisterListPref(prefs::kManagedNotificationsAllowedForUrls); |
+ registry->RegisterListPref(prefs::kManagedNotificationsBlockedForUrls); |
// Preferences for default content setting policies. If a policy is not set of |
// the corresponding preferences below is set to CONTENT_SETTING_DEFAULT. |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultCookiesSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultImagesSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultJavaScriptSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultPluginsSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultPopupsSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultGeolocationSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultNotificationsSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
- registry->RegisterIntegerPref( |
- prefs::kManagedDefaultMediaStreamSetting, |
- CONTENT_SETTING_DEFAULT, |
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultCookiesSetting, |
+ CONTENT_SETTING_DEFAULT); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultImagesSetting, |
+ CONTENT_SETTING_DEFAULT); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultJavaScriptSetting, |
+ CONTENT_SETTING_DEFAULT); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultPluginsSetting, |
+ CONTENT_SETTING_DEFAULT); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultPopupsSetting, |
+ CONTENT_SETTING_DEFAULT); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultGeolocationSetting, |
+ CONTENT_SETTING_DEFAULT); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultNotificationsSetting, |
+ CONTENT_SETTING_DEFAULT); |
+ registry->RegisterIntegerPref(prefs::kManagedDefaultMediaStreamSetting, |
+ CONTENT_SETTING_DEFAULT); |
} |
PolicyProvider::PolicyProvider(PrefService* prefs) : prefs_(prefs) { |