Index: chrome/browser/chromeos/login/app_launch_signin_screen.cc |
diff --git a/chrome/browser/chromeos/login/app_launch_signin_screen.cc b/chrome/browser/chromeos/login/app_launch_signin_screen.cc |
index fb8766e34fad58891ebf913bc1ead65b5b1f4b8b..c963d8e5b515f617992c9f1ee2febf10c56dddc0 100644 |
--- a/chrome/browser/chromeos/login/app_launch_signin_screen.cc |
+++ b/chrome/browser/chromeos/login/app_launch_signin_screen.cc |
@@ -41,13 +41,13 @@ void AppLaunchSigninScreen::Show() { |
void AppLaunchSigninScreen::InitOwnerUserList() { |
UserManager* user_manager = GetUserManager(); |
const std::string& owner_email = user_manager->GetOwnerEmail(); |
- const UserList& all_users = user_manager->GetUsers(); |
+ const user_manager::UserList& all_users = user_manager->GetUsers(); |
owner_user_list_.clear(); |
- for (UserList::const_iterator it = all_users.begin(); |
+ for (user_manager::UserList::const_iterator it = all_users.begin(); |
it != all_users.end(); |
++it) { |
- User* user = *it; |
+ user_manager::User* user = *it; |
if (user->email() == owner_email) { |
owner_user_list_.push_back(user); |
break; |
@@ -141,7 +141,7 @@ void AppLaunchSigninScreen::ShowSigninScreenForCreds( |
NOTREACHED(); |
} |
-const UserList& AppLaunchSigninScreen::GetUsers() const { |
+const user_manager::UserList& AppLaunchSigninScreen::GetUsers() const { |
if (test_user_manager_) { |
return test_user_manager_->GetUsers(); |
} |
@@ -189,9 +189,11 @@ void AppLaunchSigninScreen::OnAuthSuccess(const UserContext& user_context) { |
void AppLaunchSigninScreen::HandleGetUsers() { |
base::ListValue users_list; |
- const UserList& users = GetUsers(); |
+ const user_manager::UserList& users = GetUsers(); |
- for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) { |
+ for (user_manager::UserList::const_iterator it = users.begin(); |
+ it != users.end(); |
+ ++it) { |
ScreenlockBridge::LockHandler::AuthType initial_auth_type = |
UserSelectionScreen::ShouldForceOnlineSignIn(*it) |
? ScreenlockBridge::LockHandler::ONLINE_SIGN_IN |