diff options
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index d4fd972..8535069 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -77,6 +77,9 @@ #include "components/omnibox/browser/zero_suggest_provider.h" #include "components/password_manager/core/browser/password_bubble_experiment.h" #include "components/password_manager/core/browser/password_manager.h" +#include "components/policy/core/browser/browser_policy_connector.h" +#include "components/policy/core/browser/url_blacklist_manager.h" +#include "components/policy/core/common/policy_statistics_collector.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -101,12 +104,6 @@ #include "chrome/browser/background/background_mode_manager.h" #endif -#if defined(ENABLE_CONFIGURATION_POLICY) -#include "components/policy/core/browser/browser_policy_connector.h" -#include "components/policy/core/browser/url_blacklist_manager.h" -#include "components/policy/core/common/policy_statistics_collector.h" -#endif - #if defined(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/drive/drive_app_mapping.h" @@ -311,10 +308,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { autofill::AutofillDialogController::RegisterPrefs(registry); #endif -#if defined(ENABLE_CONFIGURATION_POLICY) policy::BrowserPolicyConnector::RegisterPrefs(registry); policy::PolicyStatisticsCollector::RegisterPrefs(registry); -#endif #if defined(ENABLE_EXTENSIONS) EasyUnlockService::RegisterPrefs(registry); @@ -449,9 +444,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { autofill::AutofillDialogController::RegisterProfilePrefs(registry); #endif -#if defined(ENABLE_CONFIGURATION_POLICY) policy::URLBlacklistManager::RegisterProfilePrefs(registry); -#endif #if defined(ENABLE_EXTENSIONS) EasyUnlockService::RegisterProfilePrefs(registry); |