| Index: chrome/browser/chromeos/device_settings_provider.cc
|
| diff --git a/chrome/browser/chromeos/device_settings_provider.cc b/chrome/browser/chromeos/device_settings_provider.cc
|
| index c24d778e6cb51a8bfbbd1e3f4e9917b2badcb766..60faf48866e53e65fcad6dc51a34b3bae346de67 100644
|
| --- a/chrome/browser/chromeos/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/device_settings_provider.cc
|
| @@ -53,6 +53,7 @@ const char* kKnownSettings[] = {
|
| kReleaseChannelDelegated,
|
| kReportDeviceActivityTimes,
|
| kReportDeviceBootMode,
|
| + kReportDeviceLocation,
|
| kReportDeviceVersionInfo,
|
| kScreenSaverExtensionId,
|
| kScreenSaverTimeout,
|
| @@ -287,14 +288,15 @@ void DeviceSettingsProvider::SetInPolicy() {
|
| // The remaining settings don't support Set(), since they are not
|
| // intended to be customizable by the user:
|
| // kAppPack
|
| - // kIdleLogoutTimeout,
|
| - // kIdleLogoutWarningDuration,
|
| - // kReleaseChannelDelegated,
|
| + // kIdleLogoutTimeout
|
| + // kIdleLogoutWarningDuration
|
| + // kReleaseChannelDelegated
|
| // kReportDeviceVersionInfo
|
| // kReportDeviceActivityTimes
|
| // kReportDeviceBootMode
|
| - // kScreenSaverExtensionId,
|
| - // kScreenSaverTimeout,
|
| + // kReportDeviceLocation
|
| + // kScreenSaverExtensionId
|
| + // kScreenSaverTimeout
|
| // kStartUpUrls
|
|
|
| NOTREACHED();
|
| @@ -490,6 +492,11 @@ void DeviceSettingsProvider::DecodeReportingPolicies(
|
| kReportDeviceBootMode,
|
| policy.device_reporting().report_boot_mode());
|
| }
|
| + if (policy.device_reporting().has_report_location()) {
|
| + new_values_cache->SetBoolean(
|
| + kReportDeviceLocation,
|
| + policy.device_reporting().report_location());
|
| + }
|
| }
|
| }
|
|
|
|
|