| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index c03af7d12cab21e9d1c5d257a9bd944c409fd3fe..7a9df8e3b7083e7b44b5f9e731b6ece40abce8d1 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -41,8 +41,6 @@
|
| #include "chrome/browser/page_info_model.h"
|
| #include "chrome/browser/password_manager/password_manager.h"
|
| #include "chrome/browser/pepper_flash_settings_manager.h"
|
| -#include "chrome/browser/policy/cloud_policy_subsystem.h"
|
| -#include "chrome/browser/policy/url_blacklist_manager.h"
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/prefs/session_startup_pref.h"
|
| @@ -75,6 +73,12 @@
|
| #include "chrome/common/pref_names.h"
|
| #include "content/public/browser/render_process_host.h"
|
|
|
| +#if defined(ENABLE_CONFIGURATION_POLICY)
|
| +#include "chrome/browser/policy/cloud_policy_subsystem.h"
|
| +#include "chrome/browser/policy/policy_statistics_collector.h"
|
| +#include "chrome/browser/policy/url_blacklist_manager.h"
|
| +#endif
|
| +
|
| #if defined(OS_MACOSX)
|
| #include "chrome/browser/ui/cocoa/confirm_quit.h"
|
| #endif
|
| @@ -151,6 +155,7 @@ void RegisterLocalState(PrefService* local_state) {
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| policy::CloudPolicySubsystem::RegisterPrefs(local_state);
|
| + policy::PolicyStatisticsCollector::RegisterPrefs(local_state);
|
| #endif
|
|
|
| #if defined(ENABLE_NOTIFICATIONS)
|
|
|