| 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 ff913b3e587059a9dae9ca1ac2d262c641e94ca8..f6de8502e7966accd7cb37e8ffe4b20841c79fd1 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store.cc
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store.cc
|
| @@ -251,8 +251,8 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
|
| prefs::kManagedPopupsAllowedForUrls },
|
| { Value::TYPE_LIST, kPolicyPopupsBlockedForUrls,
|
| prefs::kManagedPopupsBlockedForUrls },
|
| - { Value::TYPE_INTEGER, kPolicyDefaultNotificationSetting,
|
| - prefs::kDesktopNotificationDefaultContentSetting },
|
| + { Value::TYPE_INTEGER, kPolicyDefaultNotificationsSetting,
|
| + prefs::kManagedDefaultNotificationsSetting },
|
| { Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting,
|
| prefs::kManagedDefaultGeolocationSetting },
|
| { Value::TYPE_STRING, kPolicyAuthSchemes,
|
| @@ -1086,8 +1086,8 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
|
| key::kDefaultPluginsSetting },
|
| { kPolicyDefaultPopupsSetting, Value::TYPE_INTEGER,
|
| key::kDefaultPopupsSetting },
|
| - { kPolicyDefaultNotificationSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultNotificationSetting },
|
| + { kPolicyDefaultNotificationsSetting, Value::TYPE_INTEGER,
|
| + key::kDefaultNotificationsSetting },
|
| { kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER,
|
| key::kDefaultGeolocationSetting },
|
| { kPolicyCookiesAllowedForUrls, Value::TYPE_LIST,
|
|
|