Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(757)

Unified Diff: chrome/browser/chromeos/device_settings_provider.cc

Issue 9704092: Adds a device policy to specify the set of initial urls for the demo user account. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed issues and rebases to ToT. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(
« no previous file with comments | « chrome/browser/chromeos/cros_settings_names.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698