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

Unified Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 2711553002: Rename the LoginApps policy into DeviceLoginScreenAppInstallList (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index 201b08de9ae85c434315aaa1f5c668abb26ba6e9..43ca4bfacebd68bde9cb91efff28fd25fa242afc 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -329,13 +329,15 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
nullptr);
}
- if (policy.has_login_apps()) {
- const em::LoginAppsProto& login_apps_proto(policy.login_apps());
- std::unique_ptr<base::ListValue> login_apps(new base::ListValue);
- for (const auto& login_app : login_apps_proto.login_apps())
- login_apps->AppendString(login_app);
- policies->Set(key::kLoginApps, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_CLOUD, std::move(login_apps), nullptr);
+ if (policy.has_device_login_screen_app_install_list()) {
+ const em::DeviceLoginScreenAppInstallListProto& proto(
+ policy.device_login_screen_app_install_list());
+ std::unique_ptr<base::ListValue> apps(new base::ListValue);
+ for (const auto& app : proto.device_login_screen_app_install_list())
+ apps->AppendString(app);
+ policies->Set(key::kDeviceLoginScreenAppInstallList, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, std::move(apps),
+ nullptr);
}
if (policy.has_login_screen_power_management()) {
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698