chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

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 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 6 years, 5 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

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc ('k') | chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc » ('j') | no next file with comments »
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 956b0583c63c114e602a02da4e0c8e82da640c3c..6857960c40f49a0c1eed47c4408f8d91e4333f0a 100644

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

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

@@ -115,7 +115,7 @@ void AccountsOptionsHandler::HandleUnwhitelistUser(

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

CrosSettings::Get()->RemoveFromList(kAccountsPrefUsers, &canonical_email);

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

+ GetUserManager()->RemoveUser(email, NULL);

}

void AccountsOptionsHandler::HandleWhitelistExistingUsers(

@@ -134,7 +134,7 @@ void AccountsOptionsHandler::HandleWhitelistExistingUsers(

else

new_list.reset(new base::ListValue);

- const UserList& users = UserManager::Get()->GetUsers();

+ const UserList& users = GetUserManager()->GetUsers();

for (UserList::const_iterator it = users.begin(); it < users.end(); ++it)

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