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 493fabb5075aa197f8c695cd5bd6433f75c922b3..2677dc9040f14745a438429ed41ec092847cc12b 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller.cc |
+++ b/chrome/browser/chromeos/login/wizard_controller.cc |
@@ -401,9 +401,12 @@ void WizardController::ShowUpdateScreen() { |
void WizardController::ShowUserImageScreen() { |
const user_manager::UserManager* user_manager = |
user_manager::UserManager::Get(); |
- // Skip user image selection for public sessions and ephemeral logins. |
+ // Skip user image selection for public sessions and ephemeral non-regual user |
+ // logins. |
if (user_manager->IsLoggedInAsPublicAccount() || |
- user_manager->IsCurrentUserNonCryptohomeDataEphemeral()) { |
+ (user_manager->IsCurrentUserNonCryptohomeDataEphemeral() && |
+ user_manager->GetLoggedInUser()->GetType() != |
Nikita (slow)
2015/05/15 14:05:03
What about ephemeral regular users?
I think previo
dzhioev (left Google)
2015/05/15 20:09:47
The "Syncing..." UI is a part of user image screen
|
+ user_manager::USER_TYPE_REGULAR)) { |
OnUserImageSkipped(); |
return; |
} |