| 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 344d59c5b12a92aad5c73c90e2fd9bd4c9ee78bf..9bf445165c84ac2b382c1c03a48cbd5f76efaf5e 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store.cc
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store.cc
|
| @@ -229,6 +229,10 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
|
| prefs::kManagedDefaultPluginsSetting },
|
| { Value::TYPE_INTEGER, kPolicyDefaultPopupsSetting,
|
| prefs::kManagedDefaultPopupsSetting },
|
| + { Value::TYPE_INTEGER, kPolicyDefaultAutoSelectCertificateSetting,
|
| + prefs::kManagedDefaultAutoSelectCertificateSetting },
|
| + { Value::TYPE_LIST, kPolicyAutoSelectCertificateForUrls,
|
| + prefs::kManagedAutoSelectCertificateForUrls},
|
| { Value::TYPE_LIST, kPolicyCookiesAllowedForUrls,
|
| prefs::kManagedCookiesAllowedForUrls },
|
| { Value::TYPE_LIST, kPolicyCookiesBlockedForUrls,
|
| @@ -1104,6 +1108,10 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
|
| key::kDefaultNotificationsSetting },
|
| { kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER,
|
| key::kDefaultGeolocationSetting },
|
| + { kPolicyDefaultAutoSelectCertificateSetting, Value::TYPE_INTEGER,
|
| + key::kDefaultAutoSelectCertificateSetting},
|
| + { kPolicyAutoSelectCertificateForUrls, Value::TYPE_LIST,
|
| + key::kAutoSelectCertificateForUrls},
|
| { kPolicyCookiesAllowedForUrls, Value::TYPE_LIST,
|
| key::kCookiesAllowedForUrls },
|
| { kPolicyCookiesBlockedForUrls, Value::TYPE_LIST,
|
|
|