ash/system/user/tray_user.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/tray_user.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/tray_user.cc

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

index 83ab7e7514490380e3a2488adf1b30495b5df968..3a2d6e4a4d4764fd8fe73b602c46fc6d85ed730e 100644

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

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

@@ -20,6 +20,7 @@

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

#include "base/logging.h"

#include "base/strings/string16.h"

+#include "components/user_manager/user_id.h"

#include "components/user_manager/user_info.h"

#include "grit/ash_strings.h"

#include "ui/aura/window.h"

@@ -113,7 +114,7 @@ views::View* TrayUser::CreateDefaultView(user::LoginStatus status) {

}

views::View* TrayUser::CreateDetailedView(user::LoginStatus status) {

- std::string user_id = Shell::GetInstance()

+ const user_manager::UserID user_id = Shell::GetInstance()

->session_state_delegate()

->GetUserInfo(0)

->GetUserID();

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