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

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

Issue 12728009: Introduce the DeviceStartUpFlags device policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/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 44a253483f2d3526fcd75a3ebf92865684ebd655..f5f55de04ca11e05e5eecfbd9dd4153902d38520 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -63,6 +63,7 @@ const char* kKnownSettings[] = {
kStartUpUrls,
kStatsReportingPref,
kSystemTimezonePolicy,
+ kStartUpFlags,
};
// Legacy policy file location. Used to detect migration from pre v12 ChromeOS.
@@ -274,12 +275,14 @@ void DeviceSettingsProvider::SetInPolicy() {
em::UserWhitelistProto* whitelist_proto =
device_settings_.mutable_user_whitelist();
whitelist_proto->clear_user_whitelist();
- base::ListValue& users = static_cast<base::ListValue&>(*value);
- for (base::ListValue::const_iterator i = users.begin();
- i != users.end(); ++i) {
- std::string email;
- if ((*i)->GetAsString(&email))
- whitelist_proto->add_user_whitelist(email.c_str());
+ const base::ListValue* users;
+ if (value->GetAsList(&users)) {
+ for (base::ListValue::const_iterator i = users->begin();
+ i != users->end(); ++i) {
+ std::string email;
+ if ((*i)->GetAsString(&email))
+ whitelist_proto->add_user_whitelist(email);
+ }
}
} else if (prop == kAccountsPrefEphemeralUsersEnabled) {
em::EphemeralUsersEnabledProto* ephemeral_users_enabled =
@@ -301,6 +304,19 @@ void DeviceSettingsProvider::SetInPolicy() {
} else {
NOTREACHED();
}
+ } else if (prop == kStartUpFlags) {
+ em::StartUpFlagsProto* flags_proto =
+ device_settings_.mutable_start_up_flags();
+ flags_proto->Clear();
+ const base::ListValue* flags;
+ if (value->GetAsList(&flags)) {
+ for (base::ListValue::const_iterator i = flags->begin();
+ i != flags->end(); ++i) {
+ std::string flag;
+ if ((*i)->GetAsString(&flag))
+ flags_proto->add_flags(flag);
+ }
+ }
} else {
// The remaining settings don't support Set(), since they are not
// intended to be customizable by the user:
@@ -406,6 +422,17 @@ void DeviceSettingsProvider::DecodeLoginPolicies(
}
}
new_values_cache->SetValue(kAccountsPrefDeviceLocalAccounts, account_list);
+
+ if (policy.has_start_up_flags()) {
+ base::ListValue* list = new base::ListValue();
+ const em::StartUpFlagsProto& flags_proto = policy.start_up_flags();
+ const RepeatedPtrField<std::string>& flags = flags_proto.flags();
+ for (RepeatedPtrField<std::string>::const_iterator it = flags.begin();
+ it != flags.end(); ++it) {
+ list->Append(new base::StringValue(*it));
+ }
+ new_values_cache->SetValue(kStartUpFlags, list);
+ }
}
void DeviceSettingsProvider::DecodeKioskPolicies(
« no previous file with comments | « chrome/browser/chromeos/settings/cros_settings_names.cc ('k') | chrome/browser/policy/device_policy_decoder_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698