| 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 5aadaf20b125942b7b36141c34e301d00f450613..aeb0269bbd500c00ec8aef2aba0b7298aea6bcdf 100644
|
| --- a/chrome/browser/chromeos/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/device_settings_provider.cc
|
| @@ -55,6 +55,7 @@ const char* kKnownSettings[] = {
|
| kScreenSaverTimeout,
|
| kSettingProxyEverywhere,
|
| kSignedDataRoamingEnabled,
|
| + kStartUpUrls,
|
| kStatsReportingPref,
|
| };
|
|
|
| @@ -289,6 +290,7 @@ void DeviceSettingsProvider::SetInPolicy() {
|
| // kReportDeviceBootMode
|
| // kScreenSaverExtensionId,
|
| // kScreenSaverTimeout,
|
| + // kStartUpUrls
|
|
|
| NOTREACHED();
|
| }
|
| @@ -438,6 +440,17 @@ void DeviceSettingsProvider::DecodeKioskPolicies(
|
| }
|
| new_values_cache->SetValue(kAppPack, list);
|
| }
|
| +
|
| + if (policy.has_start_up_urls()) {
|
| + base::ListValue* list = new base::ListValue();
|
| + const em::StartUpUrlsProto& urls_proto = policy.start_up_urls();
|
| + const RepeatedPtrField<std::string>& urls = urls_proto.start_up_urls();
|
| + for (RepeatedPtrField<std::string>::const_iterator it = urls.begin();
|
| + it != urls.end(); ++it) {
|
| + list->Append(base::Value::CreateStringValue(*it));
|
| + }
|
| + new_values_cache->SetValue(kStartUpUrls, list);
|
| + }
|
| }
|
|
|
| void DeviceSettingsProvider::DecodeNetworkPolicies(
|
|
|