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

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

Issue 7623006: Add preference for managed notifications setting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 4 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/content_settings_policy_provider.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 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,
« no previous file with comments | « chrome/browser/content_settings/content_settings_policy_provider.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698