chrome/browser/ui/webui/options/chromeos/accounts_options_handler.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/webui/options/chromeos/accounts_options_handler.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/webui/options/browser_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

index bf980784dfd0cff2e987c23a81694fbe5443b066..d4bc6f90c9c2be539a21882e238f2bcee293c1cb 100644

--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

@@ -121,13 +121,14 @@ void AccountsOptionsHandler::HandleUnwhitelistUser(

if (!args->GetString(0, &email)) {

return;

}

+ const user_manager::UserID user_id(user_manager::UserID::FromUserEmail(gaia::CanonicalizeEmail(email)));

- base::StringValue canonical_email(gaia::CanonicalizeEmail(email));

+ base::StringValue canonical_email(user_id.GetUserEmail());

if (OwnerSettingsServiceChromeOS* service =

OwnerSettingsServiceChromeOS::FromWebUI(web_ui())) {

service->RemoveFromList(kAccountsPrefUsers, canonical_email);

}

- user_manager::UserManager::Get()->RemoveUser(email, NULL);

+ user_manager::UserManager::Get()->RemoveUser(user_id, NULL);

}

void AccountsOptionsHandler::HandleUpdateWhitelist(

@@ -164,7 +165,7 @@ void AccountsOptionsHandler::HandleUpdateWhitelist(

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

it < users.end();

++it)

- new_list->AppendIfNotPresent(new base::StringValue((*it)->email()));

+ new_list->AppendIfNotPresent(new base::StringValue((*it)->GetUserID().GetUserEmail()));

if (OwnerSettingsServiceChromeOS* service =

OwnerSettingsServiceChromeOS::FromWebUI(web_ui())) {