diff options
| author | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 12:33:57 +0000 |
|---|---|---|
| committer | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 12:33:57 +0000 |
| commit | 1c61b1f52469c2eca1812190279b03973959e6f8 (patch) | |
| tree | 75b6027c16a81644f56e251de2a459f110a3b1b0 /chrome/browser/prefs/browser_prefs.cc | |
| parent | 11b9ce078283a7457996a001f3d9911fafbe6a37 (diff) | |
| download | chromium_src-1c61b1f52469c2eca1812190279b03973959e6f8.zip chromium_src-1c61b1f52469c2eca1812190279b03973959e6f8.tar.gz chromium_src-1c61b1f52469c2eca1812190279b03973959e6f8.tar.bz2 | |
Add OS and firmware version to device status reports.
BUG=chromium-os:22035
TEST=Manual.
Review URL: http://codereview.chromium.org/8920003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 48ea888..844581b 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -35,7 +35,6 @@ #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" @@ -91,6 +90,7 @@ #include "chrome/browser/chromeos/proxy_config_service_impl.h" #include "chrome/browser/chromeos/status/input_method_menu.h" #include "chrome/browser/chromeos/status/network_menu_button.h" +#include "chrome/browser/policy/device_status_collector.h" #else #include "chrome/browser/extensions/default_apps.h" #endif @@ -130,7 +130,6 @@ 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); @@ -143,6 +142,7 @@ void RegisterLocalState(PrefService* local_state) { chromeos::signed_settings_cache::RegisterPrefs(local_state); chromeos::NetworkMenuButton::RegisterPrefs(local_state); chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); + policy::DeviceStatusCollector::RegisterPrefs(local_state); #endif } |