| 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 7c52f5a6a9dd0260063923a82900eb9d0c0bf1d7..344d59c5b12a92aad5c73c90e2fd9bd4c9ee78bf 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store.cc
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store.cc
|
| @@ -293,6 +293,18 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
|
| prefs::kPluginsAlwaysAuthorize },
|
| { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled,
|
| prefs::kEditBookmarksEnabled },
|
| + { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,
|
| + prefs::kAllowFileSelectionDialogs },
|
| + { Value::TYPE_BOOLEAN, kPolicyImportBookmarks,
|
| + prefs::kImportBookmarks},
|
| + { Value::TYPE_BOOLEAN, kPolicyImportHistory,
|
| + prefs::kImportHistory},
|
| + { Value::TYPE_BOOLEAN, kPolicyImportHomepage,
|
| + prefs::kImportHomepage},
|
| + { Value::TYPE_BOOLEAN, kPolicyImportSearchEngine,
|
| + prefs::kImportSearchEngine },
|
| + { Value::TYPE_BOOLEAN, kPolicyImportSavedPasswords,
|
| + prefs::kImportSavedPasswords },
|
| { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy,
|
| prefs::kMaxConnectionsPerProxy },
|
| { Value::TYPE_BOOLEAN, kPolicyHideWebStorePromo,
|
| @@ -1159,6 +1171,16 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
|
| key::kAllowFileSelectionDialogs },
|
| { kPolicyDiskCacheDir, Value::TYPE_STRING,
|
| key::kDiskCacheDir },
|
| + { kPolicyImportBookmarks, Value::TYPE_BOOLEAN,
|
| + key::kImportBookmarks },
|
| + { kPolicyImportHistory, Value::TYPE_BOOLEAN,
|
| + key::kImportHistory },
|
| + { kPolicyImportHomepage, Value::TYPE_BOOLEAN,
|
| + key::kImportHomepage },
|
| + { kPolicyImportSearchEngine, Value::TYPE_BOOLEAN,
|
| + key::kImportSearchEngine },
|
| + { kPolicyImportSavedPasswords, Value::TYPE_BOOLEAN,
|
| + key::kImportSavedPasswords },
|
| { kPolicyMaxConnectionsPerProxy, Value::TYPE_INTEGER,
|
| key::kMaxConnectionsPerProxy },
|
| { kPolicyHideWebStorePromo, Value::TYPE_BOOLEAN,
|
|
|