Allow default desktop content settings to be managed via policy

chrome/browser/policy/configuration_policy_pref_store.cc

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 3ebbf2e7e1152ce4bec7dd7aebf47571d9c82b6c..5e09b02b20bf19a3aeefb639a84ab25ece2030a4 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -160,17 +160,21 @@ const ConfigurationPolicyPrefStore::PolicyToPreferenceMapEntry
   { Value::TYPE_BOOLEAN, kPolicyDeveloperToolsDisabled,
     prefs::kDevToolsDisabled },
   { Value::TYPE_BOOLEAN, kPolicyBlockThirdPartyCookies,
-    prefs::kBlockThirdPartyCookies},
+    prefs::kBlockThirdPartyCookies },
   { Value::TYPE_INTEGER, kPolicyDefaultCookiesSetting,
-    prefs::kManagedDefaultCookiesSetting},
+    prefs::kManagedDefaultCookiesSetting },
   { Value::TYPE_INTEGER, kPolicyDefaultImagesSetting,
-    prefs::kManagedDefaultImagesSetting},
+    prefs::kManagedDefaultImagesSetting },
   { Value::TYPE_INTEGER, kPolicyDefaultJavaScriptSetting,
-    prefs::kManagedDefaultJavaScriptSetting},
+    prefs::kManagedDefaultJavaScriptSetting },
   { Value::TYPE_INTEGER, kPolicyDefaultPluginsSetting,
-    prefs::kManagedDefaultPluginsSetting},
+    prefs::kManagedDefaultPluginsSetting },
   { Value::TYPE_INTEGER, kPolicyDefaultPopupsSetting,
-    prefs::kManagedDefaultPopupsSetting},
+    prefs::kManagedDefaultPopupsSetting },
+  { Value::TYPE_INTEGER, kPolicyDefaultNotificationSetting,
+    prefs::kDesktopNotificationDefaultContentSetting },
+  { Value::TYPE_INTEGER, kPolicyDefaultGeolocationSetting,
+    prefs::kGeolocationDefaultContentSetting },
   { Value::TYPE_STRING, kPolicyAuthSchemes,
     prefs::kAuthSchemes },
   { Value::TYPE_BOOLEAN, kPolicyDisableAuthNegotiateCnameLookup,
@@ -279,15 +283,19 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
     { kPolicyBlockThirdPartyCookies, Value::TYPE_BOOLEAN,
       key::kBlockThirdPartyCookies },
     { kPolicyDefaultCookiesSetting, Value::TYPE_INTEGER,
-      key::kDefaultCookiesSetting},
+      key::kDefaultCookiesSetting },
     { kPolicyDefaultImagesSetting, Value::TYPE_INTEGER,
-      key::kDefaultImagesSetting},
+      key::kDefaultImagesSetting },
     { kPolicyDefaultJavaScriptSetting, Value::TYPE_INTEGER,
-      key::kDefaultJavaScriptSetting},
+      key::kDefaultJavaScriptSetting },
     { kPolicyDefaultPluginsSetting, Value::TYPE_INTEGER,
-      key::kDefaultPluginsSetting},
+      key::kDefaultPluginsSetting },
     { kPolicyDefaultPopupsSetting, Value::TYPE_INTEGER,
-      key::kDefaultPopupsSetting},
+      key::kDefaultPopupsSetting },
+    { kPolicyDefaultNotificationSetting, Value::TYPE_INTEGER,
+      key::kDefaultNotificationSetting },
+    { kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER,
+      key::kDefaultGeolocationSetting },
     { kPolicyAuthSchemes, Value::TYPE_STRING, key::kAuthSchemes },
     { kPolicyDisableAuthNegotiateCnameLookup, Value::TYPE_BOOLEAN,
       key::kDisableAuthNegotiateCnameLookup },
@@ -300,7 +308,6 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
     { kPolicyGSSAPILibraryName, Value::TYPE_STRING,
       key::kGSSAPILibraryName },
 
-
 #if defined(OS_CHROMEOS)
     { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,
       key::kChromeOsLockOnIdleSuspend },