| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 1d21c1f9a3968f17bbc5cd1e86e81ca4b4b74e5d..c1a9b40ef2c8c63189b0157dc67d00efee79a0e2 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -27,16 +27,17 @@
|
| #include "chrome/browser/geolocation/geolocation_prefs.h"
|
| #include "chrome/browser/google/google_url_tracker.h"
|
| #include "chrome/browser/host_zoom_map.h"
|
| -#include "chrome/browser/intranet_redirect_detector.h"
|
| #include "chrome/browser/instant/instant_controller.h"
|
| +#include "chrome/browser/intranet_redirect_detector.h"
|
| #include "chrome/browser/metrics/metrics_log.h"
|
| #include "chrome/browser/metrics/metrics_service.h"
|
| +#include "chrome/browser/net/net_pref_observer.h"
|
| #include "chrome/browser/net/predictor_api.h"
|
| #include "chrome/browser/net/pref_proxy_config_service.h"
|
| -#include "chrome/browser/net/net_pref_observer.h"
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/page_info_model.h"
|
| #include "chrome/browser/password_manager/password_manager.h"
|
| +#include "chrome/browser/policy/profile_policy_context.h"
|
| #include "chrome/browser/prefs/session_startup_pref.h"
|
| #include "chrome/browser/profiles/profile_impl.h"
|
| #include "chrome/browser/renderer_host/browser_render_process_host.h"
|
| @@ -151,6 +152,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
|
| TemplateURLModel::RegisterUserPrefs(user_prefs);
|
| InstantController::RegisterUserPrefs(user_prefs);
|
| NetPrefObserver::RegisterPrefs(user_prefs);
|
| + policy::ProfilePolicyContext::RegisterUserPrefs(user_prefs);
|
| }
|
|
|
| } // namespace browser
|
|
|