| 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 875a6fa098f64b20274aae1f6b31a45c4fc4f4cb..4f110f8b2c2006687519613f7678ac27211d0bc8 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store.cc
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store.cc
|
| @@ -1044,202 +1044,6 @@ ConfigurationPolicyPrefStore::CreateRecommendedCloudPolicyPrefStore() {
|
| GetRecommendedCloudProvider());
|
| }
|
|
|
| -/* static */
|
| -const ConfigurationPolicyProvider::PolicyDefinitionList*
|
| -ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
|
| - static ConfigurationPolicyProvider::PolicyDefinitionList::Entry entries[] = {
|
| - { kPolicyHomepageLocation, Value::TYPE_STRING, key::kHomepageLocation },
|
| - { kPolicyHomepageIsNewTabPage, Value::TYPE_BOOLEAN,
|
| - key::kHomepageIsNewTabPage },
|
| - { kPolicyRestoreOnStartup, Value::TYPE_INTEGER, key::kRestoreOnStartup },
|
| - { kPolicyRestoreOnStartupURLs, Value::TYPE_LIST,
|
| - key::kRestoreOnStartupURLs },
|
| - { kPolicyDefaultSearchProviderEnabled, Value::TYPE_BOOLEAN,
|
| - key::kDefaultSearchProviderEnabled },
|
| - { kPolicyDefaultSearchProviderName, Value::TYPE_STRING,
|
| - key::kDefaultSearchProviderName },
|
| - { kPolicyDefaultSearchProviderKeyword, Value::TYPE_STRING,
|
| - key::kDefaultSearchProviderKeyword },
|
| - { kPolicyDefaultSearchProviderSearchURL, Value::TYPE_STRING,
|
| - key::kDefaultSearchProviderSearchURL },
|
| - { kPolicyDefaultSearchProviderSuggestURL, Value::TYPE_STRING,
|
| - key::kDefaultSearchProviderSuggestURL },
|
| - { kPolicyDefaultSearchProviderInstantURL, Value::TYPE_STRING,
|
| - key::kDefaultSearchProviderInstantURL },
|
| - { kPolicyDefaultSearchProviderIconURL, Value::TYPE_STRING,
|
| - key::kDefaultSearchProviderIconURL },
|
| - { kPolicyDefaultSearchProviderEncodings, Value::TYPE_LIST,
|
| - key::kDefaultSearchProviderEncodings },
|
| - { kPolicyProxyMode, Value::TYPE_STRING, 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 },
|
| - { kPolicyAlternateErrorPagesEnabled, Value::TYPE_BOOLEAN,
|
| - key::kAlternateErrorPagesEnabled },
|
| - { kPolicySearchSuggestEnabled, Value::TYPE_BOOLEAN,
|
| - key::kSearchSuggestEnabled },
|
| - { kPolicyDnsPrefetchingEnabled, Value::TYPE_BOOLEAN,
|
| - key::kDnsPrefetchingEnabled },
|
| - { kPolicyDisableSpdy, Value::TYPE_BOOLEAN, key::kDisableSpdy },
|
| - { kPolicyDisabledSchemes, Value::TYPE_LIST, key::kDisabledSchemes },
|
| - { kPolicySafeBrowsingEnabled, Value::TYPE_BOOLEAN,
|
| - key::kSafeBrowsingEnabled },
|
| - { kPolicyMetricsReportingEnabled, Value::TYPE_BOOLEAN,
|
| - key::kMetricsReportingEnabled },
|
| - { kPolicyPasswordManagerEnabled, Value::TYPE_BOOLEAN,
|
| - key::kPasswordManagerEnabled },
|
| - { kPolicyPasswordManagerAllowShowPasswords, Value::TYPE_BOOLEAN,
|
| - key::kPasswordManagerAllowShowPasswords },
|
| - { kPolicyAutoFillEnabled, Value::TYPE_BOOLEAN, key::kAutoFillEnabled },
|
| - { kPolicyDisabledPlugins, Value::TYPE_LIST, key::kDisabledPlugins },
|
| - { kPolicyDisabledPluginsExceptions, Value::TYPE_LIST,
|
| - key::kDisabledPluginsExceptions },
|
| - { kPolicyEnabledPlugins, Value::TYPE_LIST, key::kEnabledPlugins },
|
| - { kPolicyApplicationLocaleValue, Value::TYPE_STRING,
|
| - key::kApplicationLocaleValue },
|
| - { kPolicySyncDisabled, Value::TYPE_BOOLEAN, key::kSyncDisabled },
|
| - { 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 },
|
| - { kPolicyIncognitoEnabled, Value::TYPE_BOOLEAN, key::kIncognitoEnabled },
|
| - { kPolicyIncognitoModeAvailability, Value::TYPE_INTEGER,
|
| - key::kIncognitoModeAvailability },
|
| - { kPolicySavingBrowserHistoryDisabled, Value::TYPE_BOOLEAN,
|
| - key::kSavingBrowserHistoryDisabled },
|
| - { kPolicyClearSiteDataOnExit, Value::TYPE_BOOLEAN,
|
| - key::kClearSiteDataOnExit },
|
| - { kPolicyDeveloperToolsDisabled, Value::TYPE_BOOLEAN,
|
| - key::kDeveloperToolsDisabled },
|
| - { kPolicyBlockThirdPartyCookies, Value::TYPE_BOOLEAN,
|
| - key::kBlockThirdPartyCookies },
|
| - { kPolicyDefaultCookiesSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultCookiesSetting },
|
| - { kPolicyDefaultImagesSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultImagesSetting },
|
| - { kPolicyDefaultJavaScriptSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultJavaScriptSetting },
|
| - { kPolicyDefaultPluginsSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultPluginsSetting },
|
| - { kPolicyDefaultPopupsSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultPopupsSetting },
|
| - { kPolicyDefaultNotificationsSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultNotificationsSetting },
|
| - { kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER,
|
| - key::kDefaultGeolocationSetting },
|
| - { kPolicyAutoSelectCertificateForUrls, Value::TYPE_LIST,
|
| - key::kAutoSelectCertificateForUrls},
|
| - { kPolicyCookiesAllowedForUrls, Value::TYPE_LIST,
|
| - key::kCookiesAllowedForUrls },
|
| - { kPolicyCookiesBlockedForUrls, Value::TYPE_LIST,
|
| - key::kCookiesBlockedForUrls },
|
| - { kPolicyCookiesSessionOnlyForUrls, Value::TYPE_LIST,
|
| - key::kCookiesSessionOnlyForUrls },
|
| - { kPolicyImagesAllowedForUrls, Value::TYPE_LIST,
|
| - key::kImagesAllowedForUrls },
|
| - { kPolicyImagesBlockedForUrls, Value::TYPE_LIST,
|
| - key::kImagesBlockedForUrls },
|
| - { kPolicyJavaScriptAllowedForUrls, Value::TYPE_LIST,
|
| - key::kJavaScriptAllowedForUrls },
|
| - { kPolicyJavaScriptBlockedForUrls, Value::TYPE_LIST,
|
| - key::kJavaScriptBlockedForUrls },
|
| - { kPolicyPluginsAllowedForUrls, Value::TYPE_LIST,
|
| - key::kPluginsAllowedForUrls },
|
| - { kPolicyPluginsBlockedForUrls, Value::TYPE_LIST,
|
| - key::kPluginsBlockedForUrls },
|
| - { kPolicyPopupsAllowedForUrls, Value::TYPE_LIST,
|
| - key::kPopupsAllowedForUrls },
|
| - { kPolicyPopupsBlockedForUrls, Value::TYPE_LIST,
|
| - key::kPopupsBlockedForUrls },
|
| - { kPolicyNotificationsAllowedForUrls, Value::TYPE_LIST,
|
| - key::kNotificationsAllowedForUrls },
|
| - { kPolicyNotificationsBlockedForUrls, Value::TYPE_LIST,
|
| - key::kNotificationsBlockedForUrls },
|
| - { kPolicyAuthSchemes, Value::TYPE_STRING, key::kAuthSchemes },
|
| - { kPolicyDisableAuthNegotiateCnameLookup, Value::TYPE_BOOLEAN,
|
| - key::kDisableAuthNegotiateCnameLookup },
|
| - { kPolicyEnableAuthNegotiatePort, Value::TYPE_BOOLEAN,
|
| - key::kEnableAuthNegotiatePort },
|
| - { kPolicyAuthServerWhitelist, Value::TYPE_STRING,
|
| - key::kAuthServerWhitelist },
|
| - { kPolicyAuthNegotiateDelegateWhitelist, Value::TYPE_STRING,
|
| - key::kAuthNegotiateDelegateWhitelist },
|
| - { kPolicyGSSAPILibraryName, Value::TYPE_STRING,
|
| - key::kGSSAPILibraryName },
|
| - { kPolicyAllowCrossOriginAuthPrompt, Value::TYPE_BOOLEAN,
|
| - key::kAllowCrossOriginAuthPrompt },
|
| - { kPolicyDisable3DAPIs, Value::TYPE_BOOLEAN,
|
| - key::kDisable3DAPIs },
|
| - { kPolicyDisablePluginFinder, Value::TYPE_BOOLEAN,
|
| - key::kDisablePluginFinder },
|
| - { kPolicyPolicyRefreshRate, Value::TYPE_INTEGER,
|
| - key::kPolicyRefreshRate },
|
| - { kPolicyDevicePolicyRefreshRate, Value::TYPE_INTEGER,
|
| - key::kDevicePolicyRefreshRate },
|
| - { kPolicyInstantEnabled, Value::TYPE_BOOLEAN, key::kInstantEnabled },
|
| - { kPolicyDefaultBrowserSettingEnabled, Value::TYPE_BOOLEAN,
|
| - key::kDefaultBrowserSettingEnabled },
|
| - { kPolicyRemoteAccessClientFirewallTraversal, Value::TYPE_BOOLEAN,
|
| - key::kRemoteAccessClientFirewallTraversal },
|
| - { kPolicyRemoteAccessHostFirewallTraversal, Value::TYPE_BOOLEAN,
|
| - key::kRemoteAccessHostFirewallTraversal },
|
| - { kPolicyCloudPrintProxyEnabled, Value::TYPE_BOOLEAN,
|
| - key::kCloudPrintProxyEnabled },
|
| - { kPolicyDownloadDirectory, Value::TYPE_STRING,
|
| - key::kDownloadDirectory },
|
| - { kPolicyTranslateEnabled, Value::TYPE_BOOLEAN, key::kTranslateEnabled },
|
| - { kPolicyAllowOutdatedPlugins, Value::TYPE_BOOLEAN,
|
| - key::kAllowOutdatedPlugins },
|
| - { kPolicyAlwaysAuthorizePlugins, Value::TYPE_BOOLEAN,
|
| - key::kAlwaysAuthorizePlugins },
|
| - { kPolicyBookmarkBarEnabled, Value::TYPE_BOOLEAN,
|
| - key::kBookmarkBarEnabled },
|
| - { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN,
|
| - key::kEditBookmarksEnabled },
|
| - { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN,
|
| - 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,
|
| - key::kHideWebStorePromo },
|
| - { kPolicyURLBlacklist, Value::TYPE_LIST,
|
| - key::kURLBlacklist },
|
| - { kPolicyURLWhitelist, Value::TYPE_LIST,
|
| - key::kURLWhitelist },
|
| -
|
| -#if defined(OS_CHROMEOS)
|
| - { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,
|
| - key::kChromeOsLockOnIdleSuspend },
|
| - { kPolicyChromeOsReleaseChannel, Value::TYPE_STRING,
|
| - key::kChromeOsReleaseChannel },
|
| -#endif
|
| - };
|
| -
|
| - static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = {
|
| - entries,
|
| - entries + arraysize(entries),
|
| - };
|
| - return &policy_list;
|
| -}
|
| -
|
| bool
|
| ConfigurationPolicyPrefStore::IsProxyPolicy(ConfigurationPolicyType policy) {
|
| return policy == kPolicyProxyMode ||
|
|
|