chrome/browser/chromeos/login/screens/chrome_user_selection_screen.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/login/screens/chrome_user_selection_screen.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: Rebased. Created 5 years, 2 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

« chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc ('K') | « chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc ('k') | chrome/browser/chromeos/login/screens/user_image_screen.cc » ('j') | chrome/browser/chromeos/login/screens/user_selection_screen.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

index 37737c7c8bc000704fa056ca8d60a21ae5bdf0d5..bfdc11095526d99656ad865af4f40c0bf55910ff 100644

--- a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

+++ b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

@@ -21,6 +21,7 @@

#include "components/policy/core/common/cloud/cloud_policy_store.h"

#include "components/policy/core/common/policy_map.h"

#include "components/policy/core/common/policy_types.h"

+#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

@@ -50,7 +51,7 @@ void ChromeUserSelectionScreen::Init(const user_manager::UserList& users,

for (user_manager::UserList::const_iterator it = users.begin();

it != users.end(); ++it) {

if ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT)

- OnPolicyUpdated((*it)->GetUserID());

+ OnPolicyUpdated((*it)->GetUserID().GetUserEmail());

}

@@ -143,8 +144,8 @@ void ChromeUserSelectionScreen::CheckForPublicSessionLocalePolicyChange(

void ChromeUserSelectionScreen::SetPublicSessionDisplayName(

const std::string& user_id) {

- const user_manager::User* user =

- user_manager::UserManager::Get()->FindUser(user_id);

+ const user_manager::User* user = user_manager::UserManager::Get()->FindUser(

+ AccountId::FromUserEmail(user_id));

if (!user || user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT)

return;