summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/device_settings_provider.cc
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 19:36:29 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 19:36:29 +0000
commit10c01b9237ffa755058f9344c6548a1d302bd5b8 (patch)
treea6fe9d7ea78a4a9cca0d5f470817924259936cf5 /chrome/browser/chromeos/device_settings_provider.cc
parent09f3707c586fb1a1fe4c46765509953d6d6f4871 (diff)
downloadchromium_src-10c01b9237ffa755058f9344c6548a1d302bd5b8.zip
chromium_src-10c01b9237ffa755058f9344c6548a1d302bd5b8.tar.gz
chromium_src-10c01b9237ffa755058f9344c6548a1d302bd5b8.tar.bz2
Re-enable device activity time reporting.
Also, make sure that we only start device policy fetches once device settings are available in order to ensure the first device policy fetch uploads the configured reporting bits. BUG=chromium-os:26251 TEST=Manual. Review URL: https://chromiumcodereview.appspot.com/9857011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/device_settings_provider.cc')
-rw-r--r--chrome/browser/chromeos/device_settings_provider.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/device_settings_provider.cc b/chrome/browser/chromeos/device_settings_provider.cc
index 59f6e1a..c24d778 100644
--- a/chrome/browser/chromeos/device_settings_provider.cc
+++ b/chrome/browser/chromeos/device_settings_provider.cc
@@ -480,8 +480,11 @@ void DeviceSettingsProvider::DecodeReportingPolicies(
kReportDeviceVersionInfo,
policy.device_reporting().report_version_info());
}
- // TODO(dubroy): Re-add device activity time policy here when the UI
- // to notify the user has been implemented (http://crosbug.com/26252).
+ if (policy.device_reporting().has_report_activity_times()) {
+ new_values_cache->SetBoolean(
+ kReportDeviceActivityTimes,
+ policy.device_reporting().report_activity_times());
+ }
if (policy.device_reporting().has_report_boot_mode()) {
new_values_cache->SetBoolean(
kReportDeviceBootMode,