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 7d956bf4928f0ef7b19afa24162f28a22ceae6a1..da683490a797928824d8848a3b322b960c1d3eae 100644 |
--- a/chrome/browser/chromeos/login/auth/login_performer.cc |
+++ b/chrome/browser/chromeos/login/auth/login_performer.cc |
@@ -15,9 +15,9 @@ |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/chromeos/boot_times_loader.h" |
#include "chrome/browser/chromeos/login/login_utils.h" |
-#include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h" |
-#include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h" |
-#include "chrome/browser/chromeos/login/managed/supervised_user_login_flow.h" |
+#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/supervised_user_manager.h" |
#include "chrome/browser/chromeos/login/users/user_manager.h" |
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
@@ -198,15 +198,15 @@ void LoginPerformer::PerformLogin(const UserContext& user_context, |
} |
} |
-void LoginPerformer::LoginAsLocallyManagedUser( |
+void LoginPerformer::LoginAsSupervisedUser( |
const UserContext& user_context) { |
- DCHECK_EQ(chromeos::login::kLocallyManagedUserDomain, |
+ DCHECK_EQ(chromeos::login::kSupervisedUserDomain, |
gaia::ExtractDomainName(user_context.GetUserID())); |
CrosSettings* cros_settings = CrosSettings::Get(); |
CrosSettingsProvider::TrustedStatus status = |
cros_settings->PrepareTrustedValues( |
- base::Bind(&LoginPerformer::LoginAsLocallyManagedUser, |
+ base::Bind(&LoginPerformer::LoginAsSupervisedUser, |
weak_factory_.GetWeakPtr(), |
user_context_)); |
// Must not proceed without signature verification. |
@@ -222,8 +222,8 @@ void LoginPerformer::LoginAsLocallyManagedUser( |
return; |
} |
- if (!UserManager::Get()->AreLocallyManagedUsersAllowed()) { |
- LOG(ERROR) << "Login attempt of locally managed user detected."; |
+ if (!UserManager::Get()->AreSupervisedUsersAllowed()) { |
+ LOG(ERROR) << "Login attempt of supervised user detected."; |
delegate_->WhiteListCheckFailed(user_context.GetUserID()); |
return; |
} |
@@ -260,7 +260,7 @@ void LoginPerformer::LoginAsLocallyManagedUser( |
BrowserThread::PostTask( |
BrowserThread::UI, |
FROM_HERE, |
- base::Bind(&Authenticator::LoginAsLocallyManagedUser, |
+ base::Bind(&Authenticator::LoginAsSupervisedUser, |
authenticator_.get(), |
user_context_copy)); |
} |