| Index: chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc
|
| index a09a04852934ec2ef43d5ec5c52202647ae5d745..216508e5b6538f0bae8f26d23813365901528659 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc
|
| @@ -212,7 +212,7 @@ void LocallyManagedUserCreationScreenHandler::PrepareToShow() {}
|
| void LocallyManagedUserCreationScreenHandler::Show() {
|
| scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
|
| scoped_ptr<base::ListValue> users_list(new base::ListValue());
|
| - const UserList& users = UserManager::Get()->GetUsers();
|
| + const UserList& users = GetUserManager()->GetUsers();
|
| std::string owner;
|
| chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
|
|
|
| @@ -301,8 +301,9 @@ void LocallyManagedUserCreationScreenHandler::HandleImportUserSelected(
|
| void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName(
|
| const base::string16& name) {
|
| std::string user_id;
|
| - if (NULL != UserManager::Get()->GetSupervisedUserManager()->
|
| - FindByDisplayName(base::CollapseWhitespace(name, true))) {
|
| + if (NULL !=
|
| + GetUserManager()->GetSupervisedUserManager()->FindByDisplayName(
|
| + base::CollapseWhitespace(name, true))) {
|
| CallJS("managedUserNameError", name,
|
| l10n_util::GetStringUTF16(
|
| IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS));
|
| @@ -325,8 +326,9 @@ void LocallyManagedUserCreationScreenHandler::HandleCreateManagedUser(
|
| return;
|
| const base::string16 new_user_name =
|
| base::CollapseWhitespace(new_raw_user_name, true);
|
| - if (NULL != UserManager::Get()->GetSupervisedUserManager()->
|
| - FindByDisplayName(new_user_name)) {
|
| + if (NULL !=
|
| + GetUserManager()->GetSupervisedUserManager()->FindByDisplayName(
|
| + new_user_name)) {
|
| CallJS("managedUserNameError", new_user_name,
|
| l10n_util::GetStringFUTF16(
|
| IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS,
|
| @@ -384,7 +386,7 @@ void LocallyManagedUserCreationScreenHandler::HandleAuthenticateManager(
|
| gaia::SanitizeEmail(raw_manager_username);
|
|
|
| UserFlow* flow = new LocallyManagedUserCreationFlow(manager_username);
|
| - UserManager::Get()->SetUserFlow(manager_username, flow);
|
| + GetUserManager()->SetUserFlow(manager_username, flow);
|
|
|
| delegate_->AuthenticateManager(manager_username, manager_password);
|
| }
|
|
|