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 c7c0dba2bae08f4e722a6243cf40b7f615e45116..560d4f77d3ed2c44c50658c4d8916d778ec60012 100644 |
| --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| @@ -298,6 +298,12 @@ user_manager::UserList ChromeUserManagerImpl::GetUsersAllowedForMultiProfile() |
| return user_manager::UserList(); |
| } |
| + // Multiprofiles are not allowed on the Active Directory managed devices. |
| + policy::BrowserPolicyConnectorChromeOS* connector = |
| + g_browser_process->platform_part()->browser_policy_connector_chromeos(); |
| + if (connector && connector->IsActiveDirectoryManaged()) |
|
Thiemo Nagel
2016/12/22 13:52:08
In which case could the connector be nullptr?
Roman Sorokin (ftl)
2016/12/22 13:56:05
I dunno. Probably never could.
Thiemo Nagel
2016/12/22 13:57:49
Then maybe we shouldn't check for it?
Roman Sorokin (ftl)
2016/12/22 14:13:03
Done.
|
| + return user_manager::UserList(); |
| + |
| user_manager::UserList result; |
| const user_manager::UserList& users = GetUsers(); |
| for (user_manager::UserList::const_iterator it = users.begin(); |