chrome/browser/chromeos/policy/device_status_collector.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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_status_collector.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Fix Win GN build. Created 5 years, 1 month 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_local_account_browsertest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f857846048eb57d56bf3871aadf0e28bfff70a15..fc12d3dd260649c67a7fde35cef6714ad36284cc 100644

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

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

@@ -216,12 +216,12 @@ GetCurrentKioskDeviceLocalAccount(chromeos::CrosSettings* settings) {

return scoped_ptr<policy::DeviceLocalAccount>();

const user_manager::User* const user =

user_manager::UserManager::Get()->GetActiveUser();

- const std::string user_id = user->GetUserID();

const std::vector<policy::DeviceLocalAccount> accounts =

policy::GetDeviceLocalAccounts(settings);

for (const auto& device_local_account : accounts) {

- if (device_local_account.user_id == user_id) {

+ if (AccountId::FromUserEmail(device_local_account.user_id) ==

+ user->GetAccountId()) {

return make_scoped_ptr(

new policy::DeviceLocalAccount(device_local_account)).Pass();

}