chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc - Issue 14885008: Actually deprecate DeviceLocalAccountInfoProto.id

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.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:

Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

index 405969253ce8640fe61522aabf626ae2bb6554c1..695ef4b1fbc9545b3858a83b455505527c180b2e 100644

--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

@@ -141,10 +141,11 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,

chromeos::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(

- chromeos::kAccountsPrefDeviceLocalAccountsKeyId, entry->id());

+ chromeos::kAccountsPrefDeviceLocalAccountsKeyId,

+ entry->deprecated_public_session_id());

entry_dict->SetIntegerWithoutPathExpansion(

chromeos::kAccountsPrefDeviceLocalAccountsKeyType,

chromeos::DEVICE_LOCAL_ACCOUNT_TYPE_PUBLIC_SESSION);