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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 entry_dict->SetStringWithoutPathExpansion( | 174 entry_dict->SetStringWithoutPathExpansion( |
175 kAccountsPrefDeviceLocalAccountsKeyId, entry->account_id()); | 175 kAccountsPrefDeviceLocalAccountsKeyId, entry->account_id()); |
176 } | 176 } |
177 entry_dict->SetIntegerWithoutPathExpansion( | 177 entry_dict->SetIntegerWithoutPathExpansion( |
178 kAccountsPrefDeviceLocalAccountsKeyType, entry->type()); | 178 kAccountsPrefDeviceLocalAccountsKeyType, entry->type()); |
179 if (entry->kiosk_app().has_app_id()) { | 179 if (entry->kiosk_app().has_app_id()) { |
180 entry_dict->SetStringWithoutPathExpansion( | 180 entry_dict->SetStringWithoutPathExpansion( |
181 kAccountsPrefDeviceLocalAccountsKeyKioskAppId, | 181 kAccountsPrefDeviceLocalAccountsKeyKioskAppId, |
182 entry->kiosk_app().app_id()); | 182 entry->kiosk_app().app_id()); |
183 } | 183 } |
| 184 if (entry->kiosk_app().has_update_url()) { |
| 185 entry_dict->SetStringWithoutPathExpansion( |
| 186 kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL, |
| 187 entry->kiosk_app().update_url()); |
| 188 } |
184 } else if (entry->has_deprecated_public_session_id()) { | 189 } else if (entry->has_deprecated_public_session_id()) { |
185 // Deprecated public session specification. | 190 // Deprecated public session specification. |
186 entry_dict->SetStringWithoutPathExpansion( | 191 entry_dict->SetStringWithoutPathExpansion( |
187 kAccountsPrefDeviceLocalAccountsKeyId, | 192 kAccountsPrefDeviceLocalAccountsKeyId, |
188 entry->deprecated_public_session_id()); | 193 entry->deprecated_public_session_id()); |
189 entry_dict->SetIntegerWithoutPathExpansion( | 194 entry_dict->SetIntegerWithoutPathExpansion( |
190 kAccountsPrefDeviceLocalAccountsKeyType, | 195 kAccountsPrefDeviceLocalAccountsKeyType, |
191 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); | 196 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); |
192 } | 197 } |
193 account_list->Append(entry_dict.release()); | 198 account_list->Append(entry_dict.release()); |
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
791 void DeviceSettingsProvider::AttemptMigration() { | 796 void DeviceSettingsProvider::AttemptMigration() { |
792 if (device_settings_service_->HasPrivateOwnerKey()) { | 797 if (device_settings_service_->HasPrivateOwnerKey()) { |
793 PrefValueMap::const_iterator i; | 798 PrefValueMap::const_iterator i; |
794 for (i = migration_values_.begin(); i != migration_values_.end(); ++i) | 799 for (i = migration_values_.begin(); i != migration_values_.end(); ++i) |
795 DoSet(i->first, *i->second); | 800 DoSet(i->first, *i->second); |
796 migration_values_.Clear(); | 801 migration_values_.Clear(); |
797 } | 802 } |
798 } | 803 } |
799 | 804 |
800 } // namespace chromeos | 805 } // namespace chromeos |
OLD | NEW |