chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/chromeos/login/supervised_user_creation_screen_handler.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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/chromeos/login/signin_userlist_unittest.cc ('k') | chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

index 60ffdaf107fce0e8b28f64a891492c839c3df9b8..38a3a7fcc6a401524aec64a4544b1b4ffc123598 100644

--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

@@ -209,11 +209,13 @@ void SupervisedUserCreationScreenHandler::PrepareToShow() {}

void SupervisedUserCreationScreenHandler::Show() {

scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());

scoped_ptr<base::ListValue> users_list(new base::ListValue());

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

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

std::string owner;

chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);

- for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {

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

+ it != users.end();

+ ++it) {

if ((*it)->GetType() != user_manager::USER_TYPE_REGULAR)

continue;

bool is_owner = ((*it)->email() == owner);