Index: chrome/browser/ui/ash/chrome_shell_delegate.cc |
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
index d4daa66cf2c6a900dbdc57421225fa8569e4dadd..9ac7946cbd279332d8bf986dcf1c6733e8c7a668 100644 |
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc |
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc |
@@ -29,7 +29,7 @@ |
#if defined(OS_CHROMEOS) |
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
#include "chrome/browser/chromeos/display/display_configuration_observer.h" |
-#include "chrome/browser/chromeos/login/users/user_manager.h" |
+#include "components/user_manager/user_manager.h" |
#endif |
// static |
@@ -52,12 +52,13 @@ bool ChromeShellDelegate::IsMultiProfilesEnabled() const { |
#if defined(OS_CHROMEOS) |
// If there is a user manager, we need to see that we can at least have 2 |
// simultaneous users to allow this feature. |
- if (!chromeos::UserManager::IsInitialized()) |
+ if (!user_manager::UserManager::IsInitialized()) |
return false; |
- size_t admitted_users_to_be_added = |
- chromeos::UserManager::Get()->GetUsersAdmittedForMultiProfile().size(); |
+ size_t admitted_users_to_be_added = user_manager::UserManager::Get() |
+ ->GetUsersAdmittedForMultiProfile() |
+ .size(); |
size_t logged_in_users = |
- chromeos::UserManager::Get()->GetLoggedInUsers().size(); |
+ user_manager::UserManager::Get()->GetLoggedInUsers().size(); |
if (!logged_in_users) { |
// The shelf gets created on the login screen and as such we have to create |
// all multi profile items of the the system tray menu before the user logs |
@@ -99,7 +100,7 @@ void ChromeShellDelegate::Exit() { |
content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() { |
#if defined(OS_CHROMEOS) |
- DCHECK(chromeos::UserManager::Get()->GetLoggedInUsers().size()); |
+ DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size()); |
#endif |
return ProfileManager::GetActiveUserProfile(); |
} |