| Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| index c028993d07a2535feda5e5c495821126f2d00027..d912b9285003bcf305ee129c41e5118f7aa53e0d 100644
|
| --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| @@ -58,7 +58,7 @@
|
| #include "media/media_features.h"
|
| #include "ppapi/features/features.h"
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| #include "chrome/browser/search/contextual_search_policy_handler_android.h"
|
| #endif
|
|
|
| @@ -101,447 +101,306 @@ namespace {
|
| // List of policy types to preference names. This is used for simple policies
|
| // that directly map to a single preference.
|
| const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
|
| - { key::kHomepageLocation,
|
| - prefs::kHomePage,
|
| - base::Value::Type::STRING },
|
| - { key::kHomepageIsNewTabPage,
|
| - prefs::kHomePageIsNewTabPage,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kRestoreOnStartupURLs,
|
| - prefs::kURLsToRestoreOnStartup,
|
| - base::Value::Type::LIST },
|
| - { key::kAlternateErrorPagesEnabled,
|
| - prefs::kAlternateErrorPagesEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kSearchSuggestEnabled,
|
| - prefs::kSearchSuggestEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kBuiltInDnsClientEnabled,
|
| - prefs::kBuiltInDnsClientEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kWPADQuickCheckEnabled,
|
| - prefs::kQuickCheckEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kPacHttpsUrlStrippingEnabled,
|
| - prefs::kPacHttpsUrlStrippingEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kSafeBrowsingEnabled,
|
| - prefs::kSafeBrowsingEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kForceGoogleSafeSearch,
|
| - prefs::kForceGoogleSafeSearch,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kForceYouTubeRestrict,
|
| - prefs::kForceYouTubeRestrict,
|
| - base::Value::Type::INTEGER},
|
| - { key::kPasswordManagerEnabled,
|
| - password_manager::prefs::kPasswordManagerSavingEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kPrintingEnabled,
|
| - prefs::kPrintingEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDisablePrintPreview,
|
| - prefs::kPrintPreviewDisabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDefaultPrinterSelection,
|
| - prefs::kPrintPreviewDefaultDestinationSelectionRules,
|
| - base::Value::Type::STRING },
|
| - { key::kApplicationLocaleValue,
|
| - prefs::kApplicationLocale,
|
| - base::Value::Type::STRING },
|
| - { key::kAlwaysOpenPdfExternally,
|
| - prefs::kPluginsAlwaysOpenPdfExternally,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kShowHomeButton,
|
| - prefs::kShowHomeButton,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kSavingBrowserHistoryDisabled,
|
| - prefs::kSavingBrowserHistoryDisabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAllowDeletingBrowserHistory,
|
| - prefs::kAllowDeletingBrowserHistory,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDeveloperToolsDisabled,
|
| - prefs::kDevToolsDisabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kBlockThirdPartyCookies,
|
| - prefs::kBlockThirdPartyCookies,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDefaultCookiesSetting,
|
| - prefs::kManagedDefaultCookiesSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDefaultImagesSetting,
|
| - prefs::kManagedDefaultImagesSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDefaultPluginsSetting,
|
| - prefs::kManagedDefaultPluginsSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDefaultPopupsSetting,
|
| - prefs::kManagedDefaultPopupsSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kAutoSelectCertificateForUrls,
|
| - prefs::kManagedAutoSelectCertificateForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kCookiesAllowedForUrls,
|
| - prefs::kManagedCookiesAllowedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kCookiesBlockedForUrls,
|
| - prefs::kManagedCookiesBlockedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kCookiesSessionOnlyForUrls,
|
| - prefs::kManagedCookiesSessionOnlyForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kImagesAllowedForUrls,
|
| - prefs::kManagedImagesAllowedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kImagesBlockedForUrls,
|
| - prefs::kManagedImagesBlockedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kJavaScriptAllowedForUrls,
|
| - prefs::kManagedJavaScriptAllowedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kJavaScriptBlockedForUrls,
|
| - prefs::kManagedJavaScriptBlockedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kPluginsAllowedForUrls,
|
| - prefs::kManagedPluginsAllowedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kPluginsBlockedForUrls,
|
| - prefs::kManagedPluginsBlockedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kPopupsAllowedForUrls,
|
| - prefs::kManagedPopupsAllowedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kPopupsBlockedForUrls,
|
| - prefs::kManagedPopupsBlockedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kNotificationsAllowedForUrls,
|
| - prefs::kManagedNotificationsAllowedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kNotificationsBlockedForUrls,
|
| - prefs::kManagedNotificationsBlockedForUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kDefaultNotificationsSetting,
|
| - prefs::kManagedDefaultNotificationsSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDefaultGeolocationSetting,
|
| - prefs::kManagedDefaultGeolocationSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kSigninAllowed,
|
| - prefs::kSigninAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kEnableOnlineRevocationChecks,
|
| - ssl_config::prefs::kCertRevocationCheckingEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kRequireOnlineRevocationChecksForLocalAnchors,
|
| - ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kEnableSha1ForLocalAnchors,
|
| - ssl_config::prefs::kCertEnableSha1LocalAnchors,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAuthSchemes,
|
| - prefs::kAuthSchemes,
|
| - base::Value::Type::STRING },
|
| - { key::kDisableAuthNegotiateCnameLookup,
|
| - prefs::kDisableAuthNegotiateCnameLookup,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kEnableAuthNegotiatePort,
|
| - prefs::kEnableAuthNegotiatePort,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAuthServerWhitelist,
|
| - prefs::kAuthServerWhitelist,
|
| - base::Value::Type::STRING },
|
| - { key::kAuthNegotiateDelegateWhitelist,
|
| - prefs::kAuthNegotiateDelegateWhitelist,
|
| - base::Value::Type::STRING },
|
| - { key::kGSSAPILibraryName,
|
| - prefs::kGSSAPILibraryName,
|
| - base::Value::Type::STRING },
|
| - { key::kAllowCrossOriginAuthPrompt,
|
| - prefs::kAllowCrossOriginAuthPrompt,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDisable3DAPIs,
|
| - prefs::kDisable3DAPIs,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDisablePluginFinder,
|
| - prefs::kDisablePluginFinder,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDiskCacheSize,
|
| - prefs::kDiskCacheSize,
|
| - base::Value::Type::INTEGER },
|
| - { key::kMediaCacheSize,
|
| - prefs::kMediaCacheSize,
|
| - base::Value::Type::INTEGER },
|
| - { key::kPolicyRefreshRate,
|
| - policy_prefs::kUserPolicyRefreshRate,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDevicePolicyRefreshRate,
|
| - prefs::kDevicePolicyRefreshRate,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDefaultBrowserSettingEnabled,
|
| - prefs::kDefaultBrowserSettingEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kCloudPrintProxyEnabled,
|
| - prefs::kCloudPrintProxyEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kCloudPrintSubmitEnabled,
|
| - prefs::kCloudPrintSubmitEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kTranslateEnabled,
|
| - prefs::kEnableTranslate,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAllowOutdatedPlugins,
|
| - prefs::kPluginsAllowOutdated,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAlwaysAuthorizePlugins,
|
| - prefs::kPluginsAlwaysAuthorize,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kBookmarkBarEnabled,
|
| - bookmarks::prefs::kShowBookmarkBar,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kEditBookmarksEnabled,
|
| - bookmarks::prefs::kEditBookmarksEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kShowAppsShortcutInBookmarkBar,
|
| - bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAllowFileSelectionDialogs,
|
| - prefs::kAllowFileSelectionDialogs,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kImportBookmarks,
|
| - prefs::kImportBookmarks,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kImportHistory,
|
| - prefs::kImportHistory,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kImportHomepage,
|
| - prefs::kImportHomepage,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kImportSearchEngine,
|
| - prefs::kImportSearchEngine,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kImportSavedPasswords,
|
| - prefs::kImportSavedPasswords,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kImportAutofillFormData,
|
| - prefs::kImportAutofillFormData,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kMaxConnectionsPerProxy,
|
| - prefs::kMaxConnectionsPerProxy,
|
| - base::Value::Type::INTEGER },
|
| - { key::kURLWhitelist,
|
| - policy_prefs::kUrlWhitelist,
|
| - base::Value::Type::LIST },
|
| - { key::kRestrictSigninToPattern,
|
| - prefs::kGoogleServicesUsernamePattern,
|
| - base::Value::Type::STRING },
|
| - { key::kDefaultWebBluetoothGuardSetting,
|
| - prefs::kManagedDefaultWebBluetoothGuardSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDefaultMediaStreamSetting,
|
| - prefs::kManagedDefaultMediaStreamSetting,
|
| - base::Value::Type::INTEGER },
|
| - { key::kDisableSafeBrowsingProceedAnyway,
|
| - prefs::kSafeBrowsingProceedAnywayDisabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kSafeBrowsingExtendedReportingOptInAllowed,
|
| - prefs::kSafeBrowsingExtendedReportingOptInAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kSSLErrorOverrideAllowed,
|
| - prefs::kSSLErrorOverrideAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kHardwareAccelerationModeEnabled,
|
| - prefs::kHardwareAccelerationModeEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAllowDinosaurEasterEgg,
|
| - prefs::kAllowDinosaurEasterEgg,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAllowedDomainsForApps,
|
| - prefs::kAllowedDomainsForApps,
|
| - base::Value::Type::STRING },
|
| - { key::kComponentUpdatesEnabled,
|
| - prefs::kComponentUpdatesEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kHomepageLocation, prefs::kHomePage, base::Value::Type::STRING},
|
| + {key::kHomepageIsNewTabPage, prefs::kHomePageIsNewTabPage,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup,
|
| + base::Value::Type::LIST},
|
| + {key::kAlternateErrorPagesEnabled, prefs::kAlternateErrorPagesEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kSearchSuggestEnabled, prefs::kSearchSuggestEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kBuiltInDnsClientEnabled, prefs::kBuiltInDnsClientEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kWPADQuickCheckEnabled, prefs::kQuickCheckEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kPacHttpsUrlStrippingEnabled, prefs::kPacHttpsUrlStrippingEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kSafeBrowsingEnabled, prefs::kSafeBrowsingEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kForceGoogleSafeSearch, prefs::kForceGoogleSafeSearch,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kForceYouTubeRestrict, prefs::kForceYouTubeRestrict,
|
| + base::Value::Type::INTEGER},
|
| + {key::kPasswordManagerEnabled,
|
| + password_manager::prefs::kPasswordManagerSavingEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kPrintingEnabled, prefs::kPrintingEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDisablePrintPreview, prefs::kPrintPreviewDisabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDefaultPrinterSelection,
|
| + prefs::kPrintPreviewDefaultDestinationSelectionRules,
|
| + base::Value::Type::STRING},
|
| + {key::kApplicationLocaleValue, prefs::kApplicationLocale,
|
| + base::Value::Type::STRING},
|
| + {key::kAlwaysOpenPdfExternally, prefs::kPluginsAlwaysOpenPdfExternally,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kShowHomeButton, prefs::kShowHomeButton, base::Value::Type::BOOLEAN},
|
| + {key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAllowDeletingBrowserHistory, prefs::kAllowDeletingBrowserHistory,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDeveloperToolsDisabled, prefs::kDevToolsDisabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kBlockThirdPartyCookies, prefs::kBlockThirdPartyCookies,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDefaultCookiesSetting, prefs::kManagedDefaultCookiesSetting,
|
| + base::Value::Type::INTEGER},
|
| + {key::kDefaultImagesSetting, prefs::kManagedDefaultImagesSetting,
|
| + base::Value::Type::INTEGER},
|
| + {key::kDefaultPluginsSetting, prefs::kManagedDefaultPluginsSetting,
|
| + base::Value::Type::INTEGER},
|
| + {key::kDefaultPopupsSetting, prefs::kManagedDefaultPopupsSetting,
|
| + base::Value::Type::INTEGER},
|
| + {key::kAutoSelectCertificateForUrls,
|
| + prefs::kManagedAutoSelectCertificateForUrls, base::Value::Type::LIST},
|
| + {key::kCookiesAllowedForUrls, prefs::kManagedCookiesAllowedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kCookiesBlockedForUrls, prefs::kManagedCookiesBlockedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kCookiesSessionOnlyForUrls, prefs::kManagedCookiesSessionOnlyForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kImagesAllowedForUrls, prefs::kManagedImagesAllowedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kImagesBlockedForUrls, prefs::kManagedImagesBlockedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kJavaScriptAllowedForUrls, prefs::kManagedJavaScriptAllowedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kJavaScriptBlockedForUrls, prefs::kManagedJavaScriptBlockedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kPluginsAllowedForUrls, prefs::kManagedPluginsAllowedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kPluginsBlockedForUrls, prefs::kManagedPluginsBlockedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kPopupsAllowedForUrls, prefs::kManagedPopupsAllowedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kPopupsBlockedForUrls, prefs::kManagedPopupsBlockedForUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kNotificationsAllowedForUrls,
|
| + prefs::kManagedNotificationsAllowedForUrls, base::Value::Type::LIST},
|
| + {key::kNotificationsBlockedForUrls,
|
| + prefs::kManagedNotificationsBlockedForUrls, base::Value::Type::LIST},
|
| + {key::kDefaultNotificationsSetting,
|
| + prefs::kManagedDefaultNotificationsSetting, base::Value::Type::INTEGER},
|
| + {key::kDefaultGeolocationSetting, prefs::kManagedDefaultGeolocationSetting,
|
| + base::Value::Type::INTEGER},
|
| + {key::kSigninAllowed, prefs::kSigninAllowed, base::Value::Type::BOOLEAN},
|
| + {key::kEnableOnlineRevocationChecks,
|
| + ssl_config::prefs::kCertRevocationCheckingEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kRequireOnlineRevocationChecksForLocalAnchors,
|
| + ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kEnableSha1ForLocalAnchors,
|
| + ssl_config::prefs::kCertEnableSha1LocalAnchors,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAuthSchemes, prefs::kAuthSchemes, base::Value::Type::STRING},
|
| + {key::kDisableAuthNegotiateCnameLookup,
|
| + prefs::kDisableAuthNegotiateCnameLookup, base::Value::Type::BOOLEAN},
|
| + {key::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAuthServerWhitelist, prefs::kAuthServerWhitelist,
|
| + base::Value::Type::STRING},
|
| + {key::kAuthNegotiateDelegateWhitelist,
|
| + prefs::kAuthNegotiateDelegateWhitelist, base::Value::Type::STRING},
|
| + {key::kGSSAPILibraryName, prefs::kGSSAPILibraryName,
|
| + base::Value::Type::STRING},
|
| + {key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDisable3DAPIs, prefs::kDisable3DAPIs, base::Value::Type::BOOLEAN},
|
| + {key::kDisablePluginFinder, prefs::kDisablePluginFinder,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDiskCacheSize, prefs::kDiskCacheSize, base::Value::Type::INTEGER},
|
| + {key::kMediaCacheSize, prefs::kMediaCacheSize, base::Value::Type::INTEGER},
|
| + {key::kPolicyRefreshRate, policy_prefs::kUserPolicyRefreshRate,
|
| + base::Value::Type::INTEGER},
|
| + {key::kDevicePolicyRefreshRate, prefs::kDevicePolicyRefreshRate,
|
| + base::Value::Type::INTEGER},
|
| + {key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kCloudPrintProxyEnabled, prefs::kCloudPrintProxyEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kCloudPrintSubmitEnabled, prefs::kCloudPrintSubmitEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kTranslateEnabled, prefs::kEnableTranslate,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAlwaysAuthorizePlugins, prefs::kPluginsAlwaysAuthorize,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kBookmarkBarEnabled, bookmarks::prefs::kShowBookmarkBar,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kEditBookmarksEnabled, bookmarks::prefs::kEditBookmarksEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kShowAppsShortcutInBookmarkBar,
|
| + bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAllowFileSelectionDialogs, prefs::kAllowFileSelectionDialogs,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kImportBookmarks, prefs::kImportBookmarks,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kImportHistory, prefs::kImportHistory, base::Value::Type::BOOLEAN},
|
| + {key::kImportHomepage, prefs::kImportHomepage, base::Value::Type::BOOLEAN},
|
| + {key::kImportSearchEngine, prefs::kImportSearchEngine,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kImportSavedPasswords, prefs::kImportSavedPasswords,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kImportAutofillFormData, prefs::kImportAutofillFormData,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kMaxConnectionsPerProxy, prefs::kMaxConnectionsPerProxy,
|
| + base::Value::Type::INTEGER},
|
| + {key::kURLWhitelist, policy_prefs::kUrlWhitelist, base::Value::Type::LIST},
|
| + {key::kRestrictSigninToPattern, prefs::kGoogleServicesUsernamePattern,
|
| + base::Value::Type::STRING},
|
| + {key::kDefaultWebBluetoothGuardSetting,
|
| + prefs::kManagedDefaultWebBluetoothGuardSetting,
|
| + base::Value::Type::INTEGER},
|
| + {key::kDefaultMediaStreamSetting, prefs::kManagedDefaultMediaStreamSetting,
|
| + base::Value::Type::INTEGER},
|
| + {key::kDisableSafeBrowsingProceedAnyway,
|
| + prefs::kSafeBrowsingProceedAnywayDisabled, base::Value::Type::BOOLEAN},
|
| + {key::kSafeBrowsingExtendedReportingOptInAllowed,
|
| + prefs::kSafeBrowsingExtendedReportingOptInAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kSSLErrorOverrideAllowed, prefs::kSSLErrorOverrideAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kHardwareAccelerationModeEnabled,
|
| + prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN},
|
| + {key::kAllowDinosaurEasterEgg, prefs::kAllowDinosaurEasterEgg,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAllowedDomainsForApps, prefs::kAllowedDomainsForApps,
|
| + base::Value::Type::STRING},
|
| + {key::kComponentUpdatesEnabled, prefs::kComponentUpdatesEnabled,
|
| + base::Value::Type::BOOLEAN},
|
|
|
| #if BUILDFLAG(ENABLE_SPELLCHECK)
|
| - { key::kSpellCheckServiceEnabled,
|
| - spellcheck::prefs::kSpellCheckUseSpellingService,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kSpellCheckServiceEnabled,
|
| + spellcheck::prefs::kSpellCheckUseSpellingService,
|
| + base::Value::Type::BOOLEAN},
|
| #endif // BUILDFLAG(ENABLE_SPELLCHECK)
|
|
|
| - { key::kDisableScreenshots,
|
| - prefs::kDisableScreenshots,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAudioCaptureAllowed,
|
| - prefs::kAudioCaptureAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kVideoCaptureAllowed,
|
| - prefs::kVideoCaptureAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAudioCaptureAllowedUrls,
|
| - prefs::kAudioCaptureAllowedUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kVideoCaptureAllowedUrls,
|
| - prefs::kVideoCaptureAllowedUrls,
|
| - base::Value::Type::LIST },
|
| - { key::kHideWebStoreIcon,
|
| - prefs::kHideWebStoreIcon,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kVariationsRestrictParameter,
|
| - variations::prefs::kVariationsRestrictParameter,
|
| - base::Value::Type::STRING },
|
| - { key::kForceEphemeralProfiles,
|
| - prefs::kForceEphemeralProfiles,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDHEEnabled,
|
| - ssl_config::prefs::kDHEEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kNTPContentSuggestionsEnabled,
|
| - ntp_snippets::prefs::kEnableSnippets,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kDisableScreenshots, prefs::kDisableScreenshots,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAudioCaptureAllowed, prefs::kAudioCaptureAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kVideoCaptureAllowed, prefs::kVideoCaptureAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAudioCaptureAllowedUrls, prefs::kAudioCaptureAllowedUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kVideoCaptureAllowedUrls, prefs::kVideoCaptureAllowedUrls,
|
| + base::Value::Type::LIST},
|
| + {key::kHideWebStoreIcon, prefs::kHideWebStoreIcon,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kVariationsRestrictParameter,
|
| + variations::prefs::kVariationsRestrictParameter,
|
| + base::Value::Type::STRING},
|
| + {key::kForceEphemeralProfiles, prefs::kForceEphemeralProfiles,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDHEEnabled, ssl_config::prefs::kDHEEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kNTPContentSuggestionsEnabled, ntp_snippets::prefs::kEnableSnippets,
|
| + base::Value::Type::BOOLEAN},
|
| #if defined(ENABLE_MEDIA_ROUTER)
|
| - { key::kEnableMediaRouter,
|
| - prefs::kEnableMediaRouter,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kEnableMediaRouter, prefs::kEnableMediaRouter,
|
| + base::Value::Type::BOOLEAN},
|
| #endif // defined(ENABLE_MEDIA_ROUTER)
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| - { key::kWebRtcUdpPortRange,
|
| - prefs::kWebRTCUDPPortRange,
|
| - base::Value::Type::STRING },
|
| + {key::kWebRtcUdpPortRange, prefs::kWebRTCUDPPortRange,
|
| + base::Value::Type::STRING},
|
| #endif // BUILDFLAG(ENABLE_WEBRTC)
|
| #if !defined(OS_MACOSX)
|
| - { key::kFullscreenAllowed,
|
| - prefs::kFullscreenAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kFullscreenAllowed, prefs::kFullscreenAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| #if BUILDFLAG(ENABLE_EXTENSIONS)
|
| - { key::kFullscreenAllowed,
|
| - extensions::pref_names::kAppFullscreenAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kFullscreenAllowed, extensions::pref_names::kAppFullscreenAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| #endif // BUILDFLAG(ENABLE_EXTENSIONS)
|
| #endif // !defined(OS_MACOSX)
|
|
|
| #if defined(OS_CHROMEOS)
|
| - { key::kChromeOsLockOnIdleSuspend,
|
| - prefs::kEnableAutoScreenLock,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kChromeOsReleaseChannel,
|
| - prefs::kChromeOsReleaseChannel,
|
| - base::Value::Type::STRING },
|
| - { key::kDriveDisabled,
|
| - drive::prefs::kDisableDrive,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDriveDisabledOverCellular,
|
| - drive::prefs::kDisableDriveOverCellular,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kExternalStorageDisabled,
|
| - prefs::kExternalStorageDisabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kExternalStorageReadOnly,
|
| - prefs::kExternalStorageReadOnly,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAudioOutputAllowed,
|
| - chromeos::prefs::kAudioOutputAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kShowLogoutButtonInTray,
|
| - prefs::kShowLogoutButtonInTray,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kShelfAutoHideBehavior,
|
| - prefs::kShelfAutoHideBehaviorLocal,
|
| - base::Value::Type::STRING },
|
| - { key::kSessionLengthLimit,
|
| - prefs::kSessionLengthLimit,
|
| - base::Value::Type::INTEGER },
|
| - { key::kWaitForInitialUserActivity,
|
| - prefs::kSessionWaitForInitialUserActivity,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kPowerManagementUsesAudioActivity,
|
| - prefs::kPowerUseAudioActivity,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kPowerManagementUsesVideoActivity,
|
| - prefs::kPowerUseVideoActivity,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAllowScreenWakeLocks,
|
| - prefs::kPowerAllowScreenWakeLocks,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kWaitForInitialUserActivity,
|
| - prefs::kPowerWaitForInitialUserActivity,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kTermsOfServiceURL,
|
| - prefs::kTermsOfServiceURL,
|
| - base::Value::Type::STRING },
|
| - { key::kShowAccessibilityOptionsInSystemTrayMenu,
|
| - prefs::kShouldAlwaysShowAccessibilityMenu,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kLargeCursorEnabled,
|
| - prefs::kAccessibilityLargeCursorEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kSpokenFeedbackEnabled,
|
| - prefs::kAccessibilitySpokenFeedbackEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kHighContrastEnabled,
|
| - prefs::kAccessibilityHighContrastEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kVirtualKeyboardEnabled,
|
| - prefs::kAccessibilityVirtualKeyboardEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDeviceLoginScreenDefaultLargeCursorEnabled,
|
| - NULL,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled,
|
| - NULL,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDeviceLoginScreenDefaultHighContrastEnabled,
|
| - NULL,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled,
|
| - NULL,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kRebootAfterUpdate,
|
| - prefs::kRebootAfterUpdate,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAttestationEnabledForUser,
|
| - prefs::kAttestationEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kChromeOsMultiProfileUserBehavior,
|
| - prefs::kMultiProfileUserBehavior,
|
| - base::Value::Type::STRING },
|
| - { key::kKeyboardDefaultToFunctionKeys,
|
| - prefs::kLanguageSendFunctionKeys,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kTouchVirtualKeyboardEnabled,
|
| - prefs::kTouchVirtualKeyboardEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kEasyUnlockAllowed,
|
| - prefs::kEasyUnlockAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kCaptivePortalAuthenticationIgnoresProxy,
|
| - prefs::kCaptivePortalAuthenticationIgnoresProxy,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kForceMaximizeOnFirstRun,
|
| - prefs::kForceMaximizeOnFirstRun,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kUnifiedDesktopEnabledByDefault,
|
| - prefs::kUnifiedDesktopEnabledByDefault,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kArcEnabled,
|
| - prefs::kArcEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kArcBackupRestoreEnabled,
|
| - prefs::kArcBackupRestoreEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kReportArcStatusEnabled,
|
| - prefs::kReportArcStatusEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kNativePrinters,
|
| - prefs::kRecommendedNativePrinters,
|
| - base::Value::Type::LIST },
|
| + {key::kChromeOsLockOnIdleSuspend, prefs::kEnableAutoScreenLock,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kChromeOsReleaseChannel, prefs::kChromeOsReleaseChannel,
|
| + base::Value::Type::STRING},
|
| + {key::kDriveDisabled, drive::prefs::kDisableDrive,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDriveDisabledOverCellular, drive::prefs::kDisableDriveOverCellular,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kExternalStorageDisabled, prefs::kExternalStorageDisabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kExternalStorageReadOnly, prefs::kExternalStorageReadOnly,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAudioOutputAllowed, chromeos::prefs::kAudioOutputAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kShowLogoutButtonInTray, prefs::kShowLogoutButtonInTray,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kShelfAutoHideBehavior, prefs::kShelfAutoHideBehaviorLocal,
|
| + base::Value::Type::STRING},
|
| + {key::kSessionLengthLimit, prefs::kSessionLengthLimit,
|
| + base::Value::Type::INTEGER},
|
| + {key::kWaitForInitialUserActivity,
|
| + prefs::kSessionWaitForInitialUserActivity, base::Value::Type::BOOLEAN},
|
| + {key::kPowerManagementUsesAudioActivity, prefs::kPowerUseAudioActivity,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kPowerManagementUsesVideoActivity, prefs::kPowerUseVideoActivity,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAllowScreenWakeLocks, prefs::kPowerAllowScreenWakeLocks,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kWaitForInitialUserActivity, prefs::kPowerWaitForInitialUserActivity,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kTermsOfServiceURL, prefs::kTermsOfServiceURL,
|
| + base::Value::Type::STRING},
|
| + {key::kShowAccessibilityOptionsInSystemTrayMenu,
|
| + prefs::kShouldAlwaysShowAccessibilityMenu, base::Value::Type::BOOLEAN},
|
| + {key::kLargeCursorEnabled, prefs::kAccessibilityLargeCursorEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kSpokenFeedbackEnabled, prefs::kAccessibilitySpokenFeedbackEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kHighContrastEnabled, prefs::kAccessibilityHighContrastEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kVirtualKeyboardEnabled, prefs::kAccessibilityVirtualKeyboardEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDeviceLoginScreenDefaultLargeCursorEnabled, NULL,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled, NULL,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDeviceLoginScreenDefaultHighContrastEnabled, NULL,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled, NULL,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kRebootAfterUpdate, prefs::kRebootAfterUpdate,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAttestationEnabledForUser, prefs::kAttestationEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kChromeOsMultiProfileUserBehavior, prefs::kMultiProfileUserBehavior,
|
| + base::Value::Type::STRING},
|
| + {key::kKeyboardDefaultToFunctionKeys, prefs::kLanguageSendFunctionKeys,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kTouchVirtualKeyboardEnabled, prefs::kTouchVirtualKeyboardEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kEasyUnlockAllowed, prefs::kEasyUnlockAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kCaptivePortalAuthenticationIgnoresProxy,
|
| + prefs::kCaptivePortalAuthenticationIgnoresProxy,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kForceMaximizeOnFirstRun, prefs::kForceMaximizeOnFirstRun,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kUnifiedDesktopEnabledByDefault,
|
| + prefs::kUnifiedDesktopEnabledByDefault, base::Value::Type::BOOLEAN},
|
| + {key::kArcEnabled, prefs::kArcEnabled, base::Value::Type::BOOLEAN},
|
| + {key::kArcBackupRestoreEnabled, prefs::kArcBackupRestoreEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kReportArcStatusEnabled, prefs::kReportArcStatusEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kNativePrinters, prefs::kRecommendedNativePrinters,
|
| + base::Value::Type::LIST},
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| // Metrics reporting is controlled by a platform specific policy for ChromeOS
|
| #if defined(OS_CHROMEOS)
|
| - { key::kDeviceMetricsReportingEnabled,
|
| - metrics::prefs::kMetricsReportingEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kDeviceMetricsReportingEnabled,
|
| + metrics::prefs::kMetricsReportingEnabled, base::Value::Type::BOOLEAN},
|
| #else
|
| { key::kMetricsReportingEnabled,
|
| metrics::prefs::kMetricsReportingEnabled,
|
| @@ -549,87 +408,70 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
|
| #endif
|
|
|
| #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
|
| - { key::kBackgroundModeEnabled,
|
| - prefs::kBackgroundModeEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kBackgroundModeEnabled, prefs::kBackgroundModeEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| - { key::kDataCompressionProxyEnabled,
|
| - prefs::kDataSaverEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kAuthAndroidNegotiateAccountType,
|
| - prefs::kAuthAndroidNegotiateAccountType,
|
| - base::Value::Type::STRING },
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| + {key::kDataCompressionProxyEnabled, prefs::kDataSaverEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kAuthAndroidNegotiateAccountType,
|
| + prefs::kAuthAndroidNegotiateAccountType, base::Value::Type::STRING},
|
| +#endif // defined(OS_ANDROID)
|
|
|
| #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
|
| - { key::kNativeMessagingUserLevelHosts,
|
| - extensions::pref_names::kNativeMessagingUserLevelHosts,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kBrowserAddPersonEnabled,
|
| - prefs::kBrowserAddPersonEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kNativeMessagingUserLevelHosts,
|
| + extensions::pref_names::kNativeMessagingUserLevelHosts,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kBrowserAddPersonEnabled, prefs::kBrowserAddPersonEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
|
|
|
| - { key::kForceBrowserSignin,
|
| - prefs::kForceBrowserSignin,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kForceBrowserSignin, prefs::kForceBrowserSignin,
|
| + base::Value::Type::BOOLEAN},
|
|
|
| #if defined(OS_WIN)
|
| - { key::kWelcomePageOnOSUpgradeEnabled,
|
| - prefs::kWelcomePageOnOSUpgradeEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kWelcomePageOnOSUpgradeEnabled, prefs::kWelcomePageOnOSUpgradeEnabled,
|
| + base::Value::Type::BOOLEAN},
|
| #endif // OS_WIN
|
|
|
| #if !defined(OS_ANDROID)
|
| - { key::kSuppressUnsupportedOSWarning,
|
| - prefs::kSuppressUnsupportedOSWarning,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kSuppressUnsupportedOSWarning, prefs::kSuppressUnsupportedOSWarning,
|
| + base::Value::Type::BOOLEAN},
|
| #endif // !OS_ANDROID
|
|
|
| #if defined(OS_CHROMEOS)
|
| - { key::kSystemTimezoneAutomaticDetection,
|
| - prefs::kSystemTimezoneAutomaticDetectionPolicy,
|
| - base::Value::Type::INTEGER },
|
| + {key::kSystemTimezoneAutomaticDetection,
|
| + prefs::kSystemTimezoneAutomaticDetectionPolicy,
|
| + base::Value::Type::INTEGER},
|
| #endif
|
|
|
| - { key::kTaskManagerEndProcessEnabled,
|
| - prefs::kTaskManagerEndProcessEnabled,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kTaskManagerEndProcessEnabled, prefs::kTaskManagerEndProcessEnabled,
|
| + base::Value::Type::BOOLEAN},
|
|
|
| #if defined(OS_CHROMEOS)
|
| - { key::kNetworkThrottlingEnabled,
|
| - prefs::kNetworkThrottlingEnabled,
|
| - base::Value::Type::DICTIONARY },
|
| -
|
| - { key::kAllowScreenLock,
|
| - prefs::kAllowScreenLock,
|
| - base::Value::Type::BOOLEAN },
|
| -
|
| - { key::kQuickUnlockModeWhitelist,
|
| - prefs::kQuickUnlockModeWhitelist,
|
| - base::Value::Type::LIST },
|
| - { key::kQuickUnlockTimeout,
|
| - prefs::kQuickUnlockTimeout,
|
| - base::Value::Type::INTEGER },
|
| - { key::kPinUnlockMinimumLength,
|
| - prefs::kPinUnlockMinimumLength,
|
| - base::Value::Type::INTEGER },
|
| - { key::kPinUnlockMaximumLength,
|
| - prefs::kPinUnlockMaximumLength,
|
| - base::Value::Type::INTEGER },
|
| - { key::kPinUnlockWeakPinsAllowed,
|
| - prefs::kPinUnlockWeakPinsAllowed,
|
| - base::Value::Type::BOOLEAN },
|
| + {key::kNetworkThrottlingEnabled, prefs::kNetworkThrottlingEnabled,
|
| + base::Value::Type::DICTIONARY},
|
| +
|
| + {key::kAllowScreenLock, prefs::kAllowScreenLock,
|
| + base::Value::Type::BOOLEAN},
|
| +
|
| + {key::kQuickUnlockModeWhitelist, prefs::kQuickUnlockModeWhitelist,
|
| + base::Value::Type::LIST},
|
| + {key::kQuickUnlockTimeout, prefs::kQuickUnlockTimeout,
|
| + base::Value::Type::INTEGER},
|
| + {key::kPinUnlockMinimumLength, prefs::kPinUnlockMinimumLength,
|
| + base::Value::Type::INTEGER},
|
| + {key::kPinUnlockMaximumLength, prefs::kPinUnlockMaximumLength,
|
| + base::Value::Type::INTEGER},
|
| + {key::kPinUnlockWeakPinsAllowed, prefs::kPinUnlockWeakPinsAllowed,
|
| + base::Value::Type::BOOLEAN},
|
| #endif
|
|
|
| - { key::kRoamingProfileSupportEnabled,
|
| - syncer::prefs::kEnableLocalSyncBackend,
|
| - base::Value::Type::BOOLEAN },
|
| - { key::kRoamingProfileLocation,
|
| - syncer::prefs::kLocalSyncBackendDir,
|
| - base::Value::Type::STRING },
|
| + {key::kRoamingProfileSupportEnabled, syncer::prefs::kEnableLocalSyncBackend,
|
| + base::Value::Type::BOOLEAN},
|
| + {key::kRoamingProfileLocation, syncer::prefs::kLocalSyncBackendDir,
|
| + base::Value::Type::STRING},
|
| };
|
|
|
| class ForceSafeSearchPolicyHandler : public TypeCheckingPolicyHandler {
|
| @@ -816,7 +658,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
|
| SCHEMA_STRICT, SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
|
| SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| handlers->AddHandler(
|
| base::MakeUnique<ContextualSearchPolicyHandlerAndroid>());
|
| #endif
|
|
|