chrome/browser/chromeos/settings/device_settings_provider.cc - Issue 14927015: Translate device-local account IDs to user IDs

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/settings/device_settings_provider.cc

Issue 14927015: Translate device-local account IDs to user IDs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments addressed. Kiosk apps fixed. 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/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 bb5bae69e3b950921399777f5d4141bc5412191c..a8db07333c2153c153fbc4e4f2b3d66f967e2d55 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -17,6 +17,7 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/network_library.h"

+#include "chrome/browser/chromeos/policy/device_local_account.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/cros_settings_names.h"

#include "chrome/browser/chromeos/settings/device_settings_cache.h"

@@ -500,7 +501,7 @@ void DeviceSettingsProvider::DecodeLoginPolicies(

entry->deprecated_public_session_id());

entry_dict->SetIntegerWithoutPathExpansion(

kAccountsPrefDeviceLocalAccountsKeyType,

- DEVICE_LOCAL_ACCOUNT_TYPE_PUBLIC_SESSION);

+ policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION);

}

account_list->Append(entry_dict.release());

}