| Index: chrome/browser/chromeos/login/wizard_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
|
| index 882302b6c074f9a87eca60e1c273da981561dd66..aa6c205301e9857fcdf9a9813eb19ebc4e90f7a9 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.cc
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc
|
| @@ -443,7 +443,7 @@ void WizardController::ShowUpdateScreen() {
|
| }
|
|
|
| void WizardController::ShowUserImageScreen() {
|
| - const chromeos::UserManager* user_manager = chromeos::UserManager::Get();
|
| + const chromeos::UserManager* user_manager = chromeos::GetUserManager();
|
| // Skip user image selection for public sessions and ephemeral logins.
|
| if (user_manager->IsLoggedInAsPublicAccount() ||
|
| user_manager->IsCurrentUserNonCryptohomeDataEphemeral()) {
|
| @@ -527,9 +527,9 @@ void WizardController::ShowTermsOfServiceScreen() {
|
| // Only show the Terms of Service when logging into a public account and Terms
|
| // of Service have been specified through policy. In all other cases, advance
|
| // to the user image screen immediately.
|
| - if (!chromeos::UserManager::Get()->IsLoggedInAsPublicAccount() ||
|
| - !ProfileManager::GetActiveUserProfile()->GetPrefs()->
|
| - IsManagedPreference(prefs::kTermsOfServiceURL)) {
|
| + if (!chromeos::GetUserManager()->IsLoggedInAsPublicAccount() ||
|
| + !ProfileManager::GetActiveUserProfile()->GetPrefs()->IsManagedPreference(
|
| + prefs::kTermsOfServiceURL)) {
|
| ShowUserImageScreen();
|
| return;
|
| }
|
|
|