chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.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/ui/ash/multi_user/multi_user_context_menu_chromeos.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/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc » ('j') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 41738b9f32792528820cec8bbf02c4310173c699..4b85ce82903c1f70f1155362d9a679acec540c3e 100644

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

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

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

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

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

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

#include "components/user_manager/user.h"

#include "components/user_manager/user_manager.h"

#include "ui/aura/window.h"

@@ -119,7 +120,8 @@ void ExecuteVisitDesktopCommand(int command_id, aura::Window* window) {

->session_state_delegate()

->GetUserInfo(IDC_VISIT_DESKTOP_OF_LRU_USER_2 == command_id ? 1

: 2)

- ->GetUserID();

+ ->GetUserID()

+ .GetUserEmail();

base::Callback<void(bool)> on_accept =

base::Bind(&OnAcceptTeleportWarning, user_id, window);

stevenjb 2015/10/22 17:52:36 I would change OnAcceptTeleportWarning to take an

Alexander Alekseev 2015/10/23 09:11:23 Done.