| 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 ee18fe76bcb11035169dd2269852d6cd15beaf5e..f4cebb19dbe9e178c8075ba7252026c5ad4be52c 100644
|
| --- a/chrome/browser/chromeos/login/app_launch_signin_screen.cc
|
| +++ b/chrome/browser/chromeos/login/app_launch_signin_screen.cc
|
| @@ -17,7 +17,7 @@
|
|
|
| namespace chromeos {
|
|
|
| -UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL;
|
| +user_manager::UserManager* AppLaunchSigninScreen::test_user_manager_ = NULL;
|
|
|
| AppLaunchSigninScreen::AppLaunchSigninScreen(
|
| OobeUI* oobe_ui, Delegate* delegate)
|
| @@ -39,7 +39,7 @@ void AppLaunchSigninScreen::Show() {
|
| }
|
|
|
| void AppLaunchSigninScreen::InitOwnerUserList() {
|
| - UserManager* user_manager = GetUserManager();
|
| + user_manager::UserManager* user_manager = GetUserManager();
|
| const std::string& owner_email = user_manager->GetOwnerEmail();
|
| const user_manager::UserList& all_users = user_manager->GetUsers();
|
|
|
| @@ -57,12 +57,13 @@ void AppLaunchSigninScreen::InitOwnerUserList() {
|
|
|
| // static
|
| void AppLaunchSigninScreen::SetUserManagerForTesting(
|
| - UserManager* user_manager) {
|
| + user_manager::UserManager* user_manager) {
|
| test_user_manager_ = user_manager;
|
| }
|
|
|
| -UserManager* AppLaunchSigninScreen::GetUserManager() {
|
| - return test_user_manager_ ? test_user_manager_ : UserManager::Get();
|
| +user_manager::UserManager* AppLaunchSigninScreen::GetUserManager() {
|
| + return test_user_manager_ ? test_user_manager_
|
| + : user_manager::UserManager::Get();
|
| }
|
|
|
| void AppLaunchSigninScreen::CancelPasswordChangedFlow() {
|
|
|