Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: chrome/browser/chromeos/login/users/chrome_user_manager_impl.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
Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index a371c90310074a0bd29f1e6f1a58bb87bf9087f1..e22220c27a8da613962626a1be8a2ba455139a31 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -230,6 +230,20 @@ user_manager::UserList ChromeUserManagerImpl::GetUsersAllowedForMultiProfile()
return result;
}
+user_manager::UserList
+ChromeUserManagerImpl::GetUsersAllowedForSupervisedUsersCreation() const {
+ CrosSettings* cros_settings = CrosSettings::Get();
+ bool allow_new_user = true;
+ cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
+ bool supervised_users_allowed = AreSupervisedUsersAllowed();
+
+ // Restricted either by policy or by owner.
+ if (!allow_new_user || !supervised_users_allowed)
+ return user_manager::UserList();
+
+ return GetUsersAllowedAsSupervisedUserManagers(GetUsers());
+}
+
user_manager::UserList ChromeUserManagerImpl::GetUnlockUsers() const {
const user_manager::UserList& logged_in_users = GetLoggedInUsers();
if (logged_in_users.empty())

Powered by Google App Engine
This is Rietveld 408576698