Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1084)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 14885008: Actually deprecate DeviceLocalAccountInfoProto.id (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc ('k') | chrome/browser/chromeos/settings/device_settings_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index 18275e746fcba4089880bf3715c910220c78e3ae..9995e4cf4149d73a865ef3725dffe07b6e92880c 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -495,10 +495,11 @@ void DeviceSettingsProvider::DecodeLoginPolicies(
kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
entry->kiosk_app().update_url());
}
- } else if (entry->has_id()) {
+ } else if (entry->has_deprecated_public_session_id()) {
// Deprecated public session specification.
entry_dict->SetStringWithoutPathExpansion(
- kAccountsPrefDeviceLocalAccountsKeyId, entry->id());
+ kAccountsPrefDeviceLocalAccountsKeyId,
+ entry->deprecated_public_session_id());
entry_dict->SetIntegerWithoutPathExpansion(
kAccountsPrefDeviceLocalAccountsKeyType,
DEVICE_LOCAL_ACCOUNT_TYPE_PUBLIC_SESSION);
« no previous file with comments | « chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc ('k') | chrome/browser/chromeos/settings/device_settings_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698