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

Unified Diff: chrome/browser/policy/configuration_policy_pref_store.cc

Issue 6542048: Add content_settings::PolicyProvider and a set of new policies to managed content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 10 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
« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 316b8c69b1c4809896d25c3b903c2069b1d1ed21..210b383cef113f4f2687f5482eba98133941deeb 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -214,6 +214,28 @@ 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, kPolicyPopupsAllowedForUrls,
+ prefs::kManagedPopupsAllowedForUrls },
+ { Value::TYPE_LIST, kPolicyPopupsBlockedForUrls,
+ prefs::kManagedPopupsBlockedForUrls },
{ Value::TYPE_INTEGER, kPolicyDefaultNotificationSetting,
prefs::kDesktopNotificationDefaultContentSetting },
{ Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting,
@@ -899,6 +921,28 @@ 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 },
+ { kPolicyPopupsAllowedForUrls, Value::TYPE_LIST,
+ key::kPopupsAllowedForUrls },
+ { kPolicyPopupsBlockedForUrls, Value::TYPE_LIST,
+ key::kPopupsBlockedForUrls },
{ kPolicyAuthSchemes, Value::TYPE_STRING, key::kAuthSchemes },
{ kPolicyDisableAuthNegotiateCnameLookup, Value::TYPE_BOOLEAN,
key::kDisableAuthNegotiateCnameLookup },
« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698