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/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
15 #include "base/threading/thread_restrictions.h" | 15 #include "base/threading/thread_restrictions.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/chromeos/cros/cros_library.h" | 18 #include "chrome/browser/chromeos/cros/cros_library.h" |
19 #include "chrome/browser/chromeos/cros/network_library.h" | 19 #include "chrome/browser/chromeos/cros/network_library.h" |
| 20 #include "chrome/browser/chromeos/policy/device_local_account.h" |
20 #include "chrome/browser/chromeos/settings/cros_settings.h" | 21 #include "chrome/browser/chromeos/settings/cros_settings.h" |
21 #include "chrome/browser/chromeos/settings/cros_settings_names.h" | 22 #include "chrome/browser/chromeos/settings/cros_settings_names.h" |
22 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 23 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
23 #include "chrome/browser/policy/browser_policy_connector.h" | 24 #include "chrome/browser/policy/browser_policy_connector.h" |
24 #include "chrome/browser/policy/cloud/cloud_policy_constants.h" | 25 #include "chrome/browser/policy/cloud/cloud_policy_constants.h" |
25 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" | 26 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" |
26 #include "chrome/browser/ui/options/options_util.h" | 27 #include "chrome/browser/ui/options/options_util.h" |
27 #include "chrome/installer/util/google_update_settings.h" | 28 #include "chrome/installer/util/google_update_settings.h" |
28 #include "chromeos/chromeos_switches.h" | 29 #include "chromeos/chromeos_switches.h" |
29 | 30 |
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL, | 482 kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL, |
482 entry->kiosk_app().update_url()); | 483 entry->kiosk_app().update_url()); |
483 } | 484 } |
484 } else if (entry->has_deprecated_public_session_id()) { | 485 } else if (entry->has_deprecated_public_session_id()) { |
485 // Deprecated public session specification. | 486 // Deprecated public session specification. |
486 entry_dict->SetStringWithoutPathExpansion( | 487 entry_dict->SetStringWithoutPathExpansion( |
487 kAccountsPrefDeviceLocalAccountsKeyId, | 488 kAccountsPrefDeviceLocalAccountsKeyId, |
488 entry->deprecated_public_session_id()); | 489 entry->deprecated_public_session_id()); |
489 entry_dict->SetIntegerWithoutPathExpansion( | 490 entry_dict->SetIntegerWithoutPathExpansion( |
490 kAccountsPrefDeviceLocalAccountsKeyType, | 491 kAccountsPrefDeviceLocalAccountsKeyType, |
491 DEVICE_LOCAL_ACCOUNT_TYPE_PUBLIC_SESSION); | 492 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); |
492 } | 493 } |
493 account_list->Append(entry_dict.release()); | 494 account_list->Append(entry_dict.release()); |
494 } | 495 } |
495 } | 496 } |
496 new_values_cache->SetValue(kAccountsPrefDeviceLocalAccounts, | 497 new_values_cache->SetValue(kAccountsPrefDeviceLocalAccounts, |
497 account_list.release()); | 498 account_list.release()); |
498 | 499 |
499 if (policy.has_device_local_accounts()) { | 500 if (policy.has_device_local_accounts()) { |
500 if (policy.device_local_accounts().has_auto_login_id()) { | 501 if (policy.device_local_accounts().has_auto_login_id()) { |
501 new_values_cache->SetString( | 502 new_values_cache->SetString( |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
919 void DeviceSettingsProvider::AttemptMigration() { | 920 void DeviceSettingsProvider::AttemptMigration() { |
920 if (device_settings_service_->HasPrivateOwnerKey()) { | 921 if (device_settings_service_->HasPrivateOwnerKey()) { |
921 PrefValueMap::const_iterator i; | 922 PrefValueMap::const_iterator i; |
922 for (i = migration_values_.begin(); i != migration_values_.end(); ++i) | 923 for (i = migration_values_.begin(); i != migration_values_.end(); ++i) |
923 DoSet(i->first, *i->second); | 924 DoSet(i->first, *i->second); |
924 migration_values_.Clear(); | 925 migration_values_.Clear(); |
925 } | 926 } |
926 } | 927 } |
927 | 928 |
928 } // namespace chromeos | 929 } // namespace chromeos |
OLD | NEW |