OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ownership/owner_settings_service_chromeos.h" | 5 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 account->set_type( | 391 account->set_type( |
392 static_cast<em::DeviceLocalAccountInfoProto::AccountType>( | 392 static_cast<em::DeviceLocalAccountInfoProto::AccountType>( |
393 type)); | 393 type)); |
394 } | 394 } |
395 std::string kiosk_app_id; | 395 std::string kiosk_app_id; |
396 if (entry_dict->GetStringWithoutPathExpansion( | 396 if (entry_dict->GetStringWithoutPathExpansion( |
397 kAccountsPrefDeviceLocalAccountsKeyKioskAppId, | 397 kAccountsPrefDeviceLocalAccountsKeyKioskAppId, |
398 &kiosk_app_id)) { | 398 &kiosk_app_id)) { |
399 account->mutable_kiosk_app()->set_app_id(kiosk_app_id); | 399 account->mutable_kiosk_app()->set_app_id(kiosk_app_id); |
400 } | 400 } |
| 401 std::string kiosk_app_update_url; |
| 402 if (entry_dict->GetStringWithoutPathExpansion( |
| 403 kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL, |
| 404 &kiosk_app_update_url)) { |
| 405 account->mutable_kiosk_app()->set_update_url(kiosk_app_update_url); |
| 406 } |
401 } else { | 407 } else { |
402 NOTREACHED(); | 408 NOTREACHED(); |
403 } | 409 } |
404 } | 410 } |
405 } else { | 411 } else { |
406 NOTREACHED(); | 412 NOTREACHED(); |
407 } | 413 } |
408 } else if (path == kAccountsPrefDeviceLocalAccountAutoLoginId) { | 414 } else if (path == kAccountsPrefDeviceLocalAccountAutoLoginId) { |
409 em::DeviceLocalAccountsProto* device_local_accounts = | 415 em::DeviceLocalAccountsProto* device_local_accounts = |
410 settings.mutable_device_local_accounts(); | 416 settings.mutable_device_local_accounts(); |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 return false; | 632 return false; |
627 } | 633 } |
628 enterprise_management::ChromeDeviceSettingsProto settings = | 634 enterprise_management::ChromeDeviceSettingsProto settings = |
629 *device_settings_service_->device_settings(); | 635 *device_settings_service_->device_settings(); |
630 settings.MergeFrom(device_settings_); | 636 settings.MergeFrom(device_settings_); |
631 device_settings_.Swap(&settings); | 637 device_settings_.Swap(&settings); |
632 return true; | 638 return true; |
633 } | 639 } |
634 | 640 |
635 } // namespace chromeos | 641 } // namespace chromeos |
OLD | NEW |