OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h" | 5 #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 if (entry.android_kiosk_app().has_class_name()) { | 214 if (entry.android_kiosk_app().has_class_name()) { |
215 entry_dict->SetStringWithoutPathExpansion( | 215 entry_dict->SetStringWithoutPathExpansion( |
216 chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskClass, | 216 chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskClass, |
217 entry.android_kiosk_app().class_name()); | 217 entry.android_kiosk_app().class_name()); |
218 } | 218 } |
219 if (entry.android_kiosk_app().has_action()) { | 219 if (entry.android_kiosk_app().has_action()) { |
220 entry_dict->SetStringWithoutPathExpansion( | 220 entry_dict->SetStringWithoutPathExpansion( |
221 chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskAction, | 221 chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskAction, |
222 entry.android_kiosk_app().action()); | 222 entry.android_kiosk_app().action()); |
223 } | 223 } |
| 224 if (entry.android_kiosk_app().has_display_name()) { |
| 225 entry_dict->SetStringWithoutPathExpansion( |
| 226 chromeos::kAccountsPrefDeviceLocalAccountsKeyArcKioskDisplayName, |
| 227 entry.android_kiosk_app().display_name()); |
| 228 } |
224 } else if (entry.has_deprecated_public_session_id()) { | 229 } else if (entry.has_deprecated_public_session_id()) { |
225 // Deprecated public session specification. | 230 // Deprecated public session specification. |
226 entry_dict->SetStringWithoutPathExpansion( | 231 entry_dict->SetStringWithoutPathExpansion( |
227 chromeos::kAccountsPrefDeviceLocalAccountsKeyId, | 232 chromeos::kAccountsPrefDeviceLocalAccountsKeyId, |
228 entry.deprecated_public_session_id()); | 233 entry.deprecated_public_session_id()); |
229 entry_dict->SetIntegerWithoutPathExpansion( | 234 entry_dict->SetIntegerWithoutPathExpansion( |
230 chromeos::kAccountsPrefDeviceLocalAccountsKeyType, | 235 chromeos::kAccountsPrefDeviceLocalAccountsKeyType, |
231 DeviceLocalAccount::TYPE_PUBLIC_SESSION); | 236 DeviceLocalAccount::TYPE_PUBLIC_SESSION); |
232 } | 237 } |
233 account_list->Append(std::move(entry_dict)); | 238 account_list->Append(std::move(entry_dict)); |
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
885 // Decode the various groups of policies. | 890 // Decode the various groups of policies. |
886 DecodeLoginPolicies(policy, policies); | 891 DecodeLoginPolicies(policy, policies); |
887 DecodeNetworkPolicies(policy, policies); | 892 DecodeNetworkPolicies(policy, policies); |
888 DecodeReportingPolicies(policy, policies); | 893 DecodeReportingPolicies(policy, policies); |
889 DecodeAutoUpdatePolicies(policy, policies); | 894 DecodeAutoUpdatePolicies(policy, policies); |
890 DecodeAccessibilityPolicies(policy, policies); | 895 DecodeAccessibilityPolicies(policy, policies); |
891 DecodeGenericPolicies(policy, policies); | 896 DecodeGenericPolicies(policy, policies); |
892 } | 897 } |
893 | 898 |
894 } // namespace policy | 899 } // namespace policy |
OLD | NEW |