| Index: chrome/browser/policy/configuration_policy_pref_store.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
|
| index 0b8445f928568756b03f47316d103ffb6e9865fd..e0df5e8bfaa50898d2a2f40a558d96c9656b1161 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store.cc
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store.cc
|
| @@ -209,6 +209,30 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
|
| prefs::kManagedDefaultPluginsSetting },
|
| { Value::TYPE_INTEGER, kPolicyDefaultPopupsSetting,
|
| prefs::kManagedDefaultPopupsSetting },
|
| + { Value::TYPE_LIST, kPolicyCookiesAllowedForUrls,
|
| + prefs::kManagedCookiesAllowedForUrls },
|
| + { Value::TYPE_LIST, kPolicyCookiesBlockedForUrls,
|
| + prefs::kManagedCookiesBlockedForUrls },
|
| + { Value::TYPE_LIST, kPolicyCookiesSessionOnlyForUrls,
|
| + prefs::kManagedCookiesSessionOnlyForUrls },
|
| + { Value::TYPE_LIST, kPolicyImagesAllowedForUrls,
|
| + prefs::kManagedImagesAllowedForUrls },
|
| + { Value::TYPE_LIST, kPolicyImagesBlockedForUrls,
|
| + prefs::kManagedImagesBlockedForUrls },
|
| + { Value::TYPE_LIST, kPolicyJavaScriptAllowedForUrls,
|
| + prefs::kManagedJavaScriptAllowedForUrls },
|
| + { Value::TYPE_LIST, kPolicyJavaScriptBlockedForUrls,
|
| + prefs::kManagedJavaScriptBlockedForUrls },
|
| + { Value::TYPE_LIST, kPolicyPluginsAllowedForUrls,
|
| + prefs::kManagedPluginsAllowedForUrls },
|
| + { Value::TYPE_LIST, kPolicyPluginsBlockedForUrls,
|
| + prefs::kManagedPluginsBlockedForUrls },
|
| + { Value::TYPE_LIST, kPolicyPluginsAskForUrls,
|
| + prefs::kManagedPluginsAskForUrls },
|
| + { Value::TYPE_LIST, kPolicyPopupsAllowedForUrls,
|
| + prefs::kManagedPopupsAllowedForUrls },
|
| + { Value::TYPE_LIST, kPolicyPopupsBlockedForUrls,
|
| + prefs::kManagedPopupsBlockedForUrls },
|
| { Value::TYPE_INTEGER, kPolicyDefaultNotificationSetting,
|
| prefs::kDesktopNotificationDefaultContentSetting },
|
| { Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting,
|
| @@ -852,6 +876,30 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
|
| key::kDefaultNotificationSetting },
|
| { kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER,
|
| key::kDefaultGeolocationSetting },
|
| + { kPolicyCookiesAllowedForUrls, Value::TYPE_LIST,
|
| + key::kCookiesAllowedForUrls },
|
| + { kPolicyCookiesBlockedForUrls, Value::TYPE_LIST,
|
| + key::kCookiesBlockedForUrls },
|
| + { kPolicyCookiesSessionOnlyForUrls, Value::TYPE_LIST,
|
| + key::kCookiesSessionOnlyForUrls },
|
| + { kPolicyImagesAllowedForUrls, Value::TYPE_LIST,
|
| + key::kImagesAllowedForUrls },
|
| + { kPolicyImagesBlockedForUrls, Value::TYPE_LIST,
|
| + key::kImagesBlockedForUrls },
|
| + { kPolicyJavaScriptAllowedForUrls, Value::TYPE_LIST,
|
| + key::kJavaScriptAllowedForUrls },
|
| + { kPolicyJavaScriptBlockedForUrls, Value::TYPE_LIST,
|
| + key::kJavaScriptBlockedForUrls },
|
| + { kPolicyPluginsAllowedForUrls, Value::TYPE_LIST,
|
| + key::kPluginsAllowedForUrls },
|
| + { kPolicyPluginsBlockedForUrls, Value::TYPE_LIST,
|
| + key::kPluginsBlockedForUrls },
|
| + { kPolicyPluginsAskForUrls, Value::TYPE_LIST,
|
| + key::kPluginsAskForUrls },
|
| + { kPolicyPopupsAllowedForUrls, Value::TYPE_LIST,
|
| + key::kPopupsAllowedForUrls },
|
| + { kPolicyPopupsBlockedForUrls, Value::TYPE_LIST,
|
| + key::kPopupsBlockedForUrls },
|
| { kPolicyAuthSchemes, Value::TYPE_STRING, key::kAuthSchemes },
|
| { kPolicyDisableAuthNegotiateCnameLookup, Value::TYPE_BOOLEAN,
|
| key::kDisableAuthNegotiateCnameLookup },
|
|
|