chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc - Issue 720723002: Creating supervised users restricted for regular users if they are supervised.

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 720723002: Creating supervised users restricted for regular users if they are supervised. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unicornUserTypePublic

Patch Set: Rebase. Created 6 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/webui/chromeos/login/supervised_user_creation_screen_handler.h ('k') | components/user_manager/user_manager.h » ('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 25471689d44940326aedd97d1c8df168e1dec9a5..d3b63439a2c7c86e07f9886136e8a366857281b4 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

@@ -214,15 +214,14 @@ void SupervisedUserCreationScreenHandler::Show() {

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

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

const user_manager::UserList& users =

- user_manager::UserManager::Get()->GetUsers();

+ user_manager::UserManager::Get()

+ ->GetUsersAllowedForSupervisedUsersCreation();

std::string owner;

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

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);

base::DictionaryValue* user_dict = new base::DictionaryValue();

UserSelectionScreen::FillUserDictionary(