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/settings/device_settings_provider.h" | 5 #include "chrome/browser/chromeos/settings/device_settings_provider.h" |
6 | 6 |
7 #include <memory.h> | 7 #include <memory.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...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 kAccountsPrefDeviceLocalAccountsKeyId, | 232 kAccountsPrefDeviceLocalAccountsKeyId, |
228 entry->deprecated_public_session_id()); | 233 entry->deprecated_public_session_id()); |
229 entry_dict->SetIntegerWithoutPathExpansion( | 234 entry_dict->SetIntegerWithoutPathExpansion( |
230 kAccountsPrefDeviceLocalAccountsKeyType, | 235 kAccountsPrefDeviceLocalAccountsKeyType, |
231 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); | 236 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); |
232 } | 237 } |
233 account_list->Append(std::move(entry_dict)); | 238 account_list->Append(std::move(entry_dict)); |
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
893 // Notify the observers we are done. | 898 // Notify the observers we are done. |
894 std::vector<base::Closure> callbacks; | 899 std::vector<base::Closure> callbacks; |
895 callbacks.swap(callbacks_); | 900 callbacks.swap(callbacks_); |
896 for (size_t i = 0; i < callbacks.size(); ++i) | 901 for (size_t i = 0; i < callbacks.size(); ++i) |
897 callbacks[i].Run(); | 902 callbacks[i].Run(); |
898 | 903 |
899 return settings_loaded; | 904 return settings_loaded; |
900 } | 905 } |
901 | 906 |
902 } // namespace chromeos | 907 } // namespace chromeos |
OLD | NEW |