chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc - Issue 1425093004: Revert of 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/ui/ash/multi_user/multi_user_window_manager.cc

Issue 1425093004: Revert of 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: 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

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

index 11da278c1c76cebad77936a7d36de4cb96ce3593..497ebe47cc6053192409ddf8c55a4e6fb528b66a 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc

@@ -14,7 +14,6 @@

#include "ash/shell.h"

#include "ash/shell_delegate.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"

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

#include "components/user_manager/user_info.h"

#endif

@@ -47,8 +46,7 @@

new MultiUserWindowManagerChromeOS(ash::Shell::GetInstance()

->session_state_delegate()

->GetUserInfo(0)

- ->GetAccountId()

- .GetUserEmail());

+ ->GetUserID());

g_instance = manager;

manager->Init();

multi_user_mode_ = MULTI_PROFILE_MODE_SEPARATED;