OLD | NEW |
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 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 void WizardController::ShowUserImageScreen() { | 447 void WizardController::ShowUserImageScreen() { |
448 const chromeos::UserManager* user_manager = chromeos::UserManager::Get(); | 448 const chromeos::UserManager* user_manager = chromeos::UserManager::Get(); |
449 // Skip user image selection for public sessions and ephemeral logins. | 449 // Skip user image selection for public sessions and ephemeral logins. |
450 if (user_manager->IsLoggedInAsPublicAccount() || | 450 if (user_manager->IsLoggedInAsPublicAccount() || |
451 user_manager->IsCurrentUserNonCryptohomeDataEphemeral()) { | 451 user_manager->IsCurrentUserNonCryptohomeDataEphemeral()) { |
452 OnUserImageSkipped(); | 452 OnUserImageSkipped(); |
453 return; | 453 return; |
454 } | 454 } |
455 VLOG(1) << "Showing user image screen."; | 455 VLOG(1) << "Showing user image screen."; |
456 | 456 |
457 bool profile_picture_enabled = true; | |
458 std::string user_id; | |
459 if (screen_parameters_.get()) { | |
460 screen_parameters_->GetBoolean("profile_picture_enabled", | |
461 &profile_picture_enabled); | |
462 screen_parameters_->GetString("user_id", &user_id); | |
463 } | |
464 | |
465 // Status area has been already shown at sign in screen so it | 457 // Status area has been already shown at sign in screen so it |
466 // doesn't make sense to hide it here and then show again at user session as | 458 // doesn't make sense to hide it here and then show again at user session as |
467 // this produces undesired UX transitions. | 459 // this produces undesired UX transitions. |
468 SetStatusAreaVisible(true); | 460 SetStatusAreaVisible(true); |
469 | 461 |
470 UserImageScreen* screen = GetUserImageScreen(); | 462 SetCurrentScreen(GetUserImageScreen()); |
471 if (!user_id.empty()) | |
472 screen->SetUserID(user_id); | |
473 screen->SetProfilePictureEnabled(profile_picture_enabled); | |
474 | |
475 SetCurrentScreen(screen); | |
476 } | 463 } |
477 | 464 |
478 void WizardController::ShowEulaScreen() { | 465 void WizardController::ShowEulaScreen() { |
479 VLOG(1) << "Showing EULA screen."; | 466 VLOG(1) << "Showing EULA screen."; |
480 SetStatusAreaVisible(true); | 467 SetStatusAreaVisible(true); |
481 SetCurrentScreen(GetEulaScreen()); | 468 SetCurrentScreen(GetEulaScreen()); |
482 } | 469 } |
483 | 470 |
484 void WizardController::ShowEnrollmentScreen() { | 471 void WizardController::ShowEnrollmentScreen() { |
485 VLOG(1) << "Showing enrollment screen."; | 472 VLOG(1) << "Showing enrollment screen."; |
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1289 bool WizardController::SetOnTimeZoneResolvedForTesting( | 1276 bool WizardController::SetOnTimeZoneResolvedForTesting( |
1290 const base::Closure& callback) { | 1277 const base::Closure& callback) { |
1291 if (timezone_resolved_) | 1278 if (timezone_resolved_) |
1292 return false; | 1279 return false; |
1293 | 1280 |
1294 on_timezone_resolved_for_testing_ = callback; | 1281 on_timezone_resolved_for_testing_ = callback; |
1295 return true; | 1282 return true; |
1296 } | 1283 } |
1297 | 1284 |
1298 } // namespace chromeos | 1285 } // namespace chromeos |
OLD | NEW |