summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/browser_prefs.cc
diff options
context:
space:
mode:
authordubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 11:40:49 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 11:40:49 +0000
commit9e5fbc9ea76ce84daa984f3dc0dde7c3478a7fc1 (patch)
tree2622c03c01a302d60fa82b376618c8fb2aed5869 /chrome/browser/prefs/browser_prefs.cc
parent59fe8f8f4807dd692bd9a9b99e08f400553f4d2c (diff)
downloadchromium_src-9e5fbc9ea76ce84daa984f3dc0dde7c3478a7fc1.zip
chromium_src-9e5fbc9ea76ce84daa984f3dc0dde7c3478a7fc1.tar.gz
chromium_src-9e5fbc9ea76ce84daa984f3dc0dde7c3478a7fc1.tar.bz2
Add device status reports to policy requests.
BUG=chromium-os:22035 TEST= Review URL: http://codereview.chromium.org/8702009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ed99909..e4dc19e 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/page_info_model.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/policy/cloud_policy_subsystem.h"
+#include "chrome/browser/policy/device_status_collector.h"
#include "chrome/browser/policy/url_blacklist_manager.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/prefs/session_startup_pref.h"
@@ -129,6 +130,7 @@ void RegisterLocalState(PrefService* local_state) {
SSLConfigServiceManager::RegisterPrefs(local_state);
#if defined(ENABLE_CONFIGURATION_POLICY)
policy::CloudPolicySubsystem::RegisterPrefs(local_state);
+ policy::DeviceStatusCollector::RegisterPrefs(local_state);
#endif
ProfileInfoCache::RegisterPrefs(local_state);
ProfileManager::RegisterPrefs(local_state);