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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 394
395 void WizardController::ShowUpdateScreen() { 395 void WizardController::ShowUpdateScreen() {
396 VLOG(1) << "Showing update screen."; 396 VLOG(1) << "Showing update screen.";
397 SetStatusAreaVisible(true); 397 SetStatusAreaVisible(true);
398 SetCurrentScreen(GetScreen(kUpdateScreenName)); 398 SetCurrentScreen(GetScreen(kUpdateScreenName));
399 } 399 }
400 400
401 void WizardController::ShowUserImageScreen() { 401 void WizardController::ShowUserImageScreen() {
402 const user_manager::UserManager* user_manager = 402 const user_manager::UserManager* user_manager =
403 user_manager::UserManager::Get(); 403 user_manager::UserManager::Get();
404 // Skip user image selection for public sessions and ephemeral logins. 404 // Skip user image selection for public sessions and ephemeral non-regual user
405 // logins.
405 if (user_manager->IsLoggedInAsPublicAccount() || 406 if (user_manager->IsLoggedInAsPublicAccount() ||
406 user_manager->IsCurrentUserNonCryptohomeDataEphemeral()) { 407 (user_manager->IsCurrentUserNonCryptohomeDataEphemeral() &&
408 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
409 user_manager::USER_TYPE_REGULAR)) {
407 OnUserImageSkipped(); 410 OnUserImageSkipped();
408 return; 411 return;
409 } 412 }
410 VLOG(1) << "Showing user image screen."; 413 VLOG(1) << "Showing user image screen.";
411 414
412 // Status area has been already shown at sign in screen so it 415 // Status area has been already shown at sign in screen so it
413 // doesn't make sense to hide it here and then show again at user session as 416 // doesn't make sense to hide it here and then show again at user session as
414 // this produces undesired UX transitions. 417 // this produces undesired UX transitions.
415 SetStatusAreaVisible(true); 418 SetStatusAreaVisible(true);
416 419
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
1314 } 1317 }
1315 1318
1316 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1319 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1317 screen->SetParameters(effective_config, shark_controller_.get(), 1320 screen->SetParameters(effective_config, shark_controller_.get(),
1318 remora_controller_.get()); 1321 remora_controller_.get());
1319 SetStatusAreaVisible(true); 1322 SetStatusAreaVisible(true);
1320 SetCurrentScreen(screen); 1323 SetCurrentScreen(screen);
1321 } 1324 }
1322 1325
1323 } // namespace chromeos 1326 } // namespace chromeos
OLDNEW
« 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