From 5e9d1f755fb8a07a87a3d1fb5400c3ab53658943 Mon Sep 17 00:00:00 2001 From: "mnissler@chromium.org" Date: Wed, 19 Jan 2011 14:15:23 +0000 Subject: Allow policy refresh rate to be configured through policy. BUG=64877 TEST=Existing unittests; manual testing. Review URL: http://codereview.chromium.org/6310012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71790 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/prefs/browser_prefs.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chrome/browser/prefs') diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 88e4b13..e098659 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -27,17 +27,18 @@ #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/notification_ui_manager.h" #include "chrome/browser/notifications/desktop_notification_service.h" +#include "chrome/browser/notifications/notification_ui_manager.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" @@ -155,6 +156,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 -- cgit v1.1