| Index: chrome/browser/chromeos/settings/device_settings_provider.cc
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| index f18d144b6f35b8815dfdf959fa011d273428ee63..7816dc7d6a36dc56ef6d8924e7c7498ea44103eb 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -75,6 +75,7 @@ const char* kKnownSettings[] = {
|
| kStartUpUrls,
|
| kStatsReportingPref,
|
| kSystemTimezonePolicy,
|
| + kSystemUse24HourClock,
|
| kUpdateDisabled,
|
| kVariationsRestrictParameter,
|
| };
|
| @@ -375,6 +376,16 @@ void DeviceSettingsProvider::SetInPolicy() {
|
| flags_proto->add_flags(flag);
|
| }
|
| }
|
| + } else if (prop == kSystemUse24HourClock) {
|
| + em::SystemUse24HourClockProto* use_24hour_clock_proto =
|
| + device_settings_.mutable_use_24hour_clock();
|
| + use_24hour_clock_proto->Clear();
|
| + bool use_24hour_clock_value;
|
| + if (value->GetAsBoolean(&use_24hour_clock_value)) {
|
| + use_24hour_clock_proto->set_use_24hour_clock(use_24hour_clock_value);
|
| + } else {
|
| + NOTREACHED();
|
| + }
|
| } else {
|
| // The remaining settings don't support Set(), since they are not
|
| // intended to be customizable by the user:
|
| @@ -704,6 +715,13 @@ void DeviceSettingsProvider::DecodeGenericPolicies(
|
| }
|
| }
|
|
|
| + if (policy.has_use_24hour_clock()) {
|
| + if (policy.use_24hour_clock().has_use_24hour_clock()) {
|
| + new_values_cache->SetBoolean(
|
| + kSystemUse24HourClock, policy.use_24hour_clock().use_24hour_clock());
|
| + }
|
| + }
|
| +
|
| if (policy.has_allow_redeem_offers()) {
|
| new_values_cache->SetBoolean(
|
| kAllowRedeemChromeOsRegistrationOffers,
|
|
|