| Index: chrome/browser/content_settings/content_settings_policy_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc
|
| index f2f9bd135a47c691d6a8bf0757a16086eb684ae1..3ee93954aad38f0c941091c35f707aae9e8255f3 100644
|
| --- a/chrome/browser/content_settings/content_settings_policy_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_policy_provider.cc
|
| @@ -36,7 +36,7 @@ const char* kPrefToManageType[CONTENT_SETTINGS_NUM_TYPES] = {
|
| prefs::kManagedDefaultPluginsSetting,
|
| prefs::kManagedDefaultPopupsSetting,
|
| prefs::kManagedDefaultGeolocationSetting,
|
| - NULL, // Not used for Notifications
|
| + prefs::kManagedDefaultNotificationsSetting,
|
| };
|
|
|
| struct PrefsForManagedContentSettingsMapEntry {
|
| @@ -119,6 +119,7 @@ PolicyDefaultProvider::PolicyDefaultProvider(PrefService* prefs)
|
| pref_change_registrar_.Add(prefs::kManagedDefaultPluginsSetting, this);
|
| pref_change_registrar_.Add(prefs::kManagedDefaultPopupsSetting, this);
|
| pref_change_registrar_.Add(prefs::kManagedDefaultGeolocationSetting, this);
|
| + pref_change_registrar_.Add(prefs::kManagedDefaultNotificationsSetting, this);
|
| }
|
|
|
| PolicyDefaultProvider::~PolicyDefaultProvider() {
|
| @@ -167,6 +168,8 @@ void PolicyDefaultProvider::Observe(int type,
|
| UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_POPUPS);
|
| } else if (*name == prefs::kManagedDefaultGeolocationSetting) {
|
| UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_GEOLOCATION);
|
| + } else if (*name == prefs::kManagedDefaultNotificationsSetting) {
|
| + UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
|
| } else {
|
| NOTREACHED() << "Unexpected preference observed";
|
| return;
|
| @@ -235,6 +238,9 @@ void PolicyDefaultProvider::RegisterUserPrefs(PrefService* prefs) {
|
| prefs->RegisterIntegerPref(prefs::kManagedDefaultGeolocationSetting,
|
| CONTENT_SETTING_DEFAULT,
|
| PrefService::UNSYNCABLE_PREF);
|
| + prefs->RegisterIntegerPref(prefs::kManagedDefaultNotificationsSetting,
|
| + CONTENT_SETTING_DEFAULT,
|
| + PrefService::UNSYNCABLE_PREF);
|
| }
|
|
|
| // ////////////////////////////////////////////////////////////////////////////
|
|
|