chrome/browser/ui/webui/options/chromeos/accounts_options_handler.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/webui/options/chromeos/accounts_options_handler.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/webui/chromeos/login/gaia_screen_handler.cc ('K') | « chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc ('k') | chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc » ('j') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('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 40b639d6302361b5e110b02407d1c46c6e037b34..e59e7e2c6bdc2e926d7665c0f4b52bf6966dce7e 100644

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

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

@@ -129,7 +129,8 @@ void AccountsOptionsHandler::HandleUnwhitelistUser(

OwnerSettingsServiceChromeOS::FromWebUI(web_ui())) {

service->RemoveFromList(kAccountsPrefUsers, canonical_email);

}

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

+ user_manager::UserManager::Get()->RemoveUser(AccountId::FromUserEmail(email),

+ NULL);

stevenjb 2015/10/22 17:52:36 nullptr

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

}

void AccountsOptionsHandler::HandleUpdateWhitelist(