| Index: chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc
|
| index 6f04d9455571784d799e70e616f66d423c3d0af9..a892ad8de8d235df605ff42567bf3cc6925a48d2 100644
|
| --- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc
|
| @@ -21,6 +21,7 @@
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/supervised_user/supervised_user_service.h"
|
| #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
|
| +#include "chromeos/login/user_names.h"
|
| #include "chromeos/settings/cros_settings_names.h"
|
| #include "components/user_manager/user_type.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -149,8 +150,8 @@ std::string SupervisedUserManagerImpl::GenerateUserId() {
|
| std::string id;
|
| bool user_exists;
|
| do {
|
| - id = base::StringPrintf("%d@%s", counter,
|
| - UserManager::kLocallyManagedUserDomain);
|
| + id = base::StringPrintf(
|
| + "%d@%s", counter, chromeos::login::kLocallyManagedUserDomain);
|
| counter++;
|
| user_exists = (NULL != owner_->FindUser(id));
|
| DCHECK(!user_exists);
|
| @@ -430,7 +431,7 @@ void SupervisedUserManagerImpl::RollbackUserCreationTransaction() {
|
| }
|
|
|
| if (gaia::ExtractDomainName(user_id) !=
|
| - UserManager::kLocallyManagedUserDomain) {
|
| + chromeos::login::kLocallyManagedUserDomain) {
|
| LOG(WARNING) << "Clean up transaction for non-locally managed user found :"
|
| << user_id << ", will not remove data";
|
| prefs->ClearPref(kLocallyManagedUserCreationTransactionDisplayName);
|
|
|