chrome/browser/ui/views/frame/system_menu_model_builder.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: chrome/browser/ui/views/frame/system_menu_model_builder.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

« chrome/browser/profiles/profile_window.cc ('K') | « chrome/browser/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc

diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc

index 0e5d48fb30939ff9f0b6900653728431ef8f3462..bb8559230d75b7c637a3df1cfd6b6eaeb0e1a886 100644

--- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc

+++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc

@@ -169,7 +169,7 @@ void SystemMenuModelBuilder::AppendTeleportMenu(ui::SimpleMenuModel* model) {

// is not owned by anyone, we don't show the menu addition.

chrome::MultiUserWindowManager* manager =

chrome::MultiUserWindowManager::GetInstance();

- const std::string user_id =

+ const user_manager::UserID user_id =

multi_user_util::GetUserIDFromProfile(browser()->profile());

aura::Window* window = browser()->window()->GetNativeWindow();

if (user_id.empty() || !window || manager->GetWindowOwner(window).empty())