ash/system/user/user_view.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: ash/system/user/user_view.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: Fixed tests. 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

Index: ash/system/user/user_view.cc

diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc

index 7f7ece54398a7dc7979551056450dcc70bbe3025..0c48ca9977608d7b7a4c8cfc087faad88460231b 100644

--- a/ash/system/user/user_view.cc

+++ b/ash/system/user/user_view.cc

@@ -19,6 +19,7 @@

#include "ash/system/user/config.h"

#include "ash/system/user/rounded_image_view.h"

#include "ash/system/user/user_card_view.h"

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

#include "components/user_manager/user_info.h"

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

@@ -77,7 +78,8 @@ void SwitchUser(ash::UserIndex user_index) {

ash::Shell::GetInstance()->session_state_delegate();

ash::MultiProfileUMA::RecordSwitchActiveUser(

ash::MultiProfileUMA::SWITCH_ACTIVE_USER_BY_TRAY);

- delegate->SwitchActiveUser(delegate->GetUserInfo(user_index)->GetUserID());

+ delegate->SwitchActiveUser(

+ delegate->GetUserInfo(user_index)->GetAccountId().GetUserEmail());

}

class LogoutButton : public TrayPopupLabelButton {

« no previous file with comments | « ash/system/user/tray_user_unittest.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | ash/test/test_session_state_delegate.cc » ('J')