chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc - Issue 1428213004: This CL replaces std::string user_id in ash/* 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 1428213004: This CL replaces std::string user_id in ash/* with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. Created 5 years, 1 month 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/launcher/multi_profile_app_window_launcher_controller.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_context_menu_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_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 7d808f1f88616468fae93f070cfe8f860d40a1f6..4cf0a184bfbb03d3eaf588ac0f2ecbfad0c76ac4 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

@@ -76,8 +76,8 @@ scoped_ptr<ui::MenuModel> CreateMultiUserContextMenu(aura::Window* window) {

// If this window is not owned, we don't show the menu addition.

chrome::MultiUserWindowManager* manager =

chrome::MultiUserWindowManager::GetInstance();

- const std::string user_id = manager->GetWindowOwner(window);

- if (user_id.empty() || !window)

+ const AccountId& account_id = manager->GetWindowOwner(window);

+ if (!account_id.is_valid() || !window)

return model.Pass();

chromeos::MultiUserContextMenuChromeos* menu =

new chromeos::MultiUserContextMenuChromeos(window);

@@ -105,8 +105,8 @@ void OnAcceptTeleportWarning(const AccountId& account_id,

ash::MultiProfileUMA::RecordTeleportAction(

ash::MultiProfileUMA::TELEPORT_WINDOW_CAPTION_MENU);

- chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(

- window_, account_id.GetUserEmail());

+ chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(window_,

+ account_id);

}

void ExecuteVisitDesktopCommand(int command_id, aura::Window* window) {

@@ -131,9 +131,9 @@ void ExecuteVisitDesktopCommand(int command_id, aura::Window* window) {

for (user_manager::UserList::const_iterator it = logged_in_users.begin();

it != logged_in_users.end();

++it) {

- if (multi_user_util::GetProfileFromUserID(

- multi_user_util::GetUserIDFromEmail((*it)->email()))->GetPrefs()->

- GetBoolean(prefs::kMultiProfileWarningShowDismissed)) {

+ if (multi_user_util::GetProfileFromAccountId((*it)->GetAccountId())

+ ->GetPrefs()

+ ->GetBoolean(prefs::kMultiProfileWarningShowDismissed)) {

bool active_user_show_option =

ProfileManager::GetActiveUserProfile()->

GetPrefs()->GetBoolean(prefs::kMultiProfileWarningShowDismissed);