Index: chrome/browser/chromeos/login/auth/login_performer.cc |
diff --git a/chrome/browser/chromeos/login/auth/login_performer.cc b/chrome/browser/chromeos/login/auth/login_performer.cc |
index ec9c19f97ef4652793e7286472aee844cec8ec36..b093664c67b1437aacd8cad5c5d66651ef36757a 100644 |
--- a/chrome/browser/chromeos/login/auth/login_performer.cc |
+++ b/chrome/browser/chromeos/login/auth/login_performer.cc |
@@ -18,8 +18,8 @@ |
#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h" |
#include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h" |
#include "chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h" |
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
#include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
-#include "chrome/browser/chromeos/login/users/user_manager.h" |
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
@@ -29,6 +29,7 @@ |
#include "chromeos/dbus/session_manager_client.h" |
#include "chromeos/login/user_names.h" |
#include "chromeos/settings/cros_settings_names.h" |
+#include "components/user_manager/user_manager.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_types.h" |
@@ -219,7 +220,7 @@ void LoginPerformer::LoginAsSupervisedUser( |
return; |
} |
- if (!UserManager::Get()->AreSupervisedUsersAllowed()) { |
+ if (!user_manager::UserManager::Get()->AreSupervisedUsersAllowed()) { |
LOG(ERROR) << "Login attempt of supervised user detected."; |
delegate_->WhiteListCheckFailed(user_context.GetUserID()); |
return; |
@@ -228,11 +229,11 @@ void LoginPerformer::LoginAsSupervisedUser( |
SupervisedUserLoginFlow* new_flow = |
new SupervisedUserLoginFlow(user_context.GetUserID()); |
new_flow->set_host( |
- UserManager::Get()->GetUserFlow(user_context.GetUserID())->host()); |
- UserManager::Get()->SetUserFlow(user_context.GetUserID(), new_flow); |
+ ChromeUserManager::Get()->GetUserFlow(user_context.GetUserID())->host()); |
+ ChromeUserManager::Get()->SetUserFlow(user_context.GetUserID(), new_flow); |
- SupervisedUserAuthentication* authentication = UserManager::Get()-> |
- GetSupervisedUserManager()->GetAuthentication(); |
+ SupervisedUserAuthentication* authentication = |
+ ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication(); |
UserContext user_context_copy = authentication->TransformKey(user_context); |