Chromium Code Reviews| 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 629af1138ed1588e06df3fed6943d485ff838bff..0f0424bc0f07d1005e30bc2e8185f53e8cee8df9 100644 |
| --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| @@ -50,6 +50,7 @@ |
| #include "chromeos/settings/cros_settings_names.h" |
| #include "components/session_manager/core/session_manager.h" |
| #include "components/user_manager/remove_user_delegate.h" |
| +#include "components/user_manager/user.h" |
| #include "components/user_manager/user_image/user_image.h" |
| #include "components/user_manager/user_type.h" |
| #include "content/public/browser/browser_thread.h" |
| @@ -230,6 +231,20 @@ user_manager::UserList ChromeUserManagerImpl::GetUsersAllowedForMultiProfile() |
| return result; |
| } |
| +user_manager::UserList |
| +ChromeUserManagerImpl::GetUsersAllowedForSupervisedUsersCreation() const { |
| + CrosSettings* cros_settings = CrosSettings::Get(); |
| + bool allow_new_user = true; |
|
Nikita (slow)
2014/11/12 11:09:08
https://code.google.com/p/chromium/codesearch#sear
merkulova
2014/11/12 13:19:51
Acknowledged.
|
| + 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 GetUsersAllowedAsSUManagers(GetUsers()); |
| +} |
| + |
| user_manager::UserList ChromeUserManagerImpl::GetUnlockUsers() const { |
| const user_manager::UserList& logged_in_users = GetLoggedInUsers(); |
| if (logged_in_users.empty()) |