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

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

Issue 6002015: Policy: generate boilerplate policy type and constant code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 10 years 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
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 1dc917a88f1ab6993a265305850a3a2a0263ba38..8cf4d2163e03eac44b4395d7d000e3a2c4b10eaf 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -25,6 +25,7 @@
#elif defined(OS_POSIX)
#include "chrome/browser/policy/config_dir_policy_provider.h"
#endif
+#include "chrome/browser/policy/configuration_policy_type.h"
#include "chrome/browser/policy/device_management_policy_provider.h"
#include "chrome/browser/policy/dummy_configuration_policy_provider.h"
#include "chrome/browser/policy/profile_policy_context.h"
@@ -157,12 +158,12 @@ class ConfigurationPolicyPrefKeeper
const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
ConfigurationPolicyPrefKeeper::kSimplePolicyMap[] = {
- { Value::TYPE_STRING, kPolicyHomePage, prefs::kHomePage },
+ { Value::TYPE_STRING, kPolicyHomepageLocation, prefs::kHomePage },
{ Value::TYPE_BOOLEAN, kPolicyHomepageIsNewTabPage,
prefs::kHomePageIsNewTabPage },
{ Value::TYPE_INTEGER, kPolicyRestoreOnStartup,
prefs::kRestoreOnStartup},
- { Value::TYPE_LIST, kPolicyURLsToRestoreOnStartup,
+ { Value::TYPE_LIST, kPolicyRestoreOnStartupURLs,
prefs::kURLsToRestoreOnStartup },
{ Value::TYPE_BOOLEAN, kPolicyAlternateErrorPagesEnabled,
prefs::kAlternateErrorPagesEnabled },
@@ -182,13 +183,13 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
prefs::kPrintingEnabled },
{ Value::TYPE_BOOLEAN, kPolicyMetricsReportingEnabled,
prefs::kMetricsReportingEnabled },
- { Value::TYPE_STRING, kPolicyApplicationLocale,
+ { Value::TYPE_STRING, kPolicyApplicationLocaleValue,
prefs::kApplicationLocale},
- { Value::TYPE_LIST, kPolicyExtensionInstallAllowList,
+ { Value::TYPE_LIST, kPolicyExtensionInstallWhitelist,
prefs::kExtensionInstallAllowList},
- { Value::TYPE_LIST, kPolicyExtensionInstallDenyList,
+ { Value::TYPE_LIST, kPolicyExtensionInstallBlacklist,
prefs::kExtensionInstallDenyList},
- { Value::TYPE_LIST, kPolicyExtensionInstallForceList,
+ { Value::TYPE_LIST, kPolicyExtensionInstallForcelist,
prefs::kExtensionInstallForceList},
{ Value::TYPE_LIST, kPolicyDisabledPlugins,
prefs::kPluginsPluginsBlacklist},
@@ -370,7 +371,7 @@ bool ConfigurationPolicyPrefKeeper::ApplyProxyPolicy(
// We only collect the values until we have sufficient information when
// FinalizeProxyPolicySettings() is called to determine whether the presented
// values were correct and apply them in that case.
- if (policy == kPolicyProxyMode ||
+ if (policy == kPolicyProxyServerMode ||
policy == kPolicyProxyServer ||
policy == kPolicyProxyPacUrl ||
policy == kPolicyProxyBypassList) {
@@ -497,7 +498,7 @@ void ConfigurationPolicyPrefKeeper::FinalizeProxyPolicySettings() {
}
bool ConfigurationPolicyPrefKeeper::CheckProxySettings() {
- bool mode = HasProxyPolicy(kPolicyProxyMode);
+ bool mode = HasProxyPolicy(kPolicyProxyServerMode);
bool server = HasProxyPolicy(kPolicyProxyServer);
bool pac_url = HasProxyPolicy(kPolicyProxyPacUrl);
bool bypass_list = HasProxyPolicy(kPolicyProxyBypassList);
@@ -512,7 +513,7 @@ bool ConfigurationPolicyPrefKeeper::CheckProxySettings() {
return true;
int mode_value;
- if (!proxy_policies_[kPolicyProxyMode]->GetAsInteger(&mode_value)) {
+ if (!proxy_policies_[kPolicyProxyServerMode]->GetAsInteger(&mode_value)) {
LOG(WARNING) << "Invalid proxy mode value.";
return false;
}
@@ -564,11 +565,11 @@ bool ConfigurationPolicyPrefKeeper::CheckProxySettings() {
}
void ConfigurationPolicyPrefKeeper::ApplyProxySettings() {
- if (!HasProxyPolicy(kPolicyProxyMode))
+ if (!HasProxyPolicy(kPolicyProxyServerMode))
return;
int int_mode;
- CHECK(proxy_policies_[kPolicyProxyMode]->GetAsInteger(&int_mode));
+ CHECK(proxy_policies_[kPolicyProxyServerMode]->GetAsInteger(&int_mode));
ProxyPrefs::ProxyMode mode;
switch (int_mode) {
case kPolicyNoProxyServerMode:
@@ -777,12 +778,12 @@ ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore() {
const ConfigurationPolicyProvider::PolicyDefinitionList*
ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
static ConfigurationPolicyProvider::PolicyDefinitionList::Entry entries[] = {
- { kPolicyHomePage, Value::TYPE_STRING, key::kHomepageLocation },
+ { kPolicyHomepageLocation, Value::TYPE_STRING, key::kHomepageLocation },
{ kPolicyHomepageIsNewTabPage, Value::TYPE_BOOLEAN,
key::kHomepageIsNewTabPage },
{ kPolicyRestoreOnStartup, Value::TYPE_INTEGER, key::kRestoreOnStartup },
- { kPolicyURLsToRestoreOnStartup, Value::TYPE_LIST,
- key::kURLsToRestoreOnStartup },
+ { kPolicyRestoreOnStartupURLs, Value::TYPE_LIST,
+ key::kRestoreOnStartupURLs },
{ kPolicyDefaultSearchProviderEnabled, Value::TYPE_BOOLEAN,
key::kDefaultSearchProviderEnabled },
{ kPolicyDefaultSearchProviderName, Value::TYPE_STRING,
@@ -797,7 +798,7 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
key::kDefaultSearchProviderIconURL },
{ kPolicyDefaultSearchProviderEncodings, Value::TYPE_STRING,
key::kDefaultSearchProviderEncodings },
- { kPolicyProxyMode, Value::TYPE_INTEGER, key::kProxyMode },
+ { kPolicyProxyServerMode, Value::TYPE_INTEGER, key::kProxyServerMode },
{ kPolicyProxyServer, Value::TYPE_STRING, key::kProxyServer },
{ kPolicyProxyPacUrl, Value::TYPE_STRING, key::kProxyPacUrl },
{ kPolicyProxyBypassList, Value::TYPE_STRING, key::kProxyBypassList },
@@ -818,15 +819,15 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
key::kPasswordManagerAllowShowPasswords },
{ kPolicyAutoFillEnabled, Value::TYPE_BOOLEAN, key::kAutoFillEnabled },
{ kPolicyDisabledPlugins, Value::TYPE_LIST, key::kDisabledPlugins },
- { kPolicyApplicationLocale, Value::TYPE_STRING,
+ { kPolicyApplicationLocaleValue, Value::TYPE_STRING,
key::kApplicationLocaleValue },
{ kPolicySyncDisabled, Value::TYPE_BOOLEAN, key::kSyncDisabled },
- { kPolicyExtensionInstallAllowList, Value::TYPE_LIST,
- key::kExtensionInstallAllowList },
- { kPolicyExtensionInstallDenyList, Value::TYPE_LIST,
- key::kExtensionInstallDenyList },
- { kPolicyExtensionInstallForceList, Value::TYPE_LIST,
- key::kExtensionInstallForceList },
+ { kPolicyExtensionInstallWhitelist, Value::TYPE_LIST,
+ key::kExtensionInstallWhitelist },
+ { kPolicyExtensionInstallBlacklist, Value::TYPE_LIST,
+ key::kExtensionInstallBlacklist },
+ { kPolicyExtensionInstallForcelist, Value::TYPE_LIST,
+ key::kExtensionInstallForcelist },
{ kPolicyShowHomeButton, Value::TYPE_BOOLEAN, key::kShowHomeButton },
{ kPolicyPrintingEnabled, Value::TYPE_BOOLEAN, key::kPrintingEnabled },
{ kPolicyJavascriptEnabled, Value::TYPE_BOOLEAN, key::kJavascriptEnabled },

Powered by Google App Engine
This is Rietveld 408576698