Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 1141163003: Enabled first-run tutorial for ephemeral users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698