| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| index e453e88c64c94c718e7f27cecff22776715d935b..88052af43224b15944469fcd767be726b163ad54 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| @@ -425,7 +425,7 @@ LoginDisplayHostImpl::~LoginDisplayHostImpl() {
|
|
|
| default_host_ = NULL;
|
| // TODO(tengs): This should be refactored. See crbug.com/314934.
|
| - if (UserManager::Get()->IsCurrentUserNew()) {
|
| + if (GetUserManager()->IsCurrentUserNew()) {
|
| // DriveOptInController will delete itself when finished.
|
| (new DriveFirstRunController(
|
| ProfileManager::GetActiveUserProfile()))->EnableOfflineMode();
|
| @@ -585,7 +585,7 @@ void LoginDisplayHostImpl::StartUserAdding(
|
| SetOobeProgressBarVisible(oobe_progress_bar_visible_ = false);
|
| SetStatusAreaVisible(true);
|
| sign_in_controller_->Init(
|
| - chromeos::UserManager::Get()->GetUsersAdmittedForMultiProfile());
|
| + chromeos::GetUserManager()->GetUsersAdmittedForMultiProfile());
|
| CHECK(webui_login_display_);
|
| GetOobeUI()->ShowSigninScreen(LoginScreenContext(),
|
| webui_login_display_,
|
| @@ -621,7 +621,7 @@ void LoginDisplayHostImpl::StartSignInScreen(
|
| }
|
|
|
| DVLOG(1) << "Starting sign in screen";
|
| - const chromeos::UserList& users = chromeos::UserManager::Get()->GetUsers();
|
| + const chromeos::UserList& users = chromeos::GetUserManager()->GetUsers();
|
|
|
| // Fix for users who updated device and thus never passed register screen.
|
| // If we already have users, we assume that it is not a second part of
|
| @@ -793,7 +793,7 @@ void LoginDisplayHostImpl::Observe(
|
| chrome::NOTIFICATION_BROWSER_OPENED,
|
| content::NotificationService::AllSources());
|
| } else if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED &&
|
| - chromeos::UserManager::Get()->IsCurrentUserNew()) {
|
| + chromeos::GetUserManager()->IsCurrentUserNew()) {
|
| // For new user, move desktop to locker container so that windows created
|
| // during the user image picker step are below it.
|
| ash::Shell::GetInstance()->
|
|
|