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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 oobe_display_ = NULL; | 436 oobe_display_ = NULL; |
437 } | 437 } |
438 | 438 |
439 void WizardController::ShowUpdateScreen() { | 439 void WizardController::ShowUpdateScreen() { |
440 VLOG(1) << "Showing update screen."; | 440 VLOG(1) << "Showing update screen."; |
441 SetStatusAreaVisible(true); | 441 SetStatusAreaVisible(true); |
442 SetCurrentScreen(GetUpdateScreen()); | 442 SetCurrentScreen(GetUpdateScreen()); |
443 } | 443 } |
444 | 444 |
445 void WizardController::ShowUserImageScreen() { | 445 void WizardController::ShowUserImageScreen() { |
446 const chromeos::UserManager* user_manager = chromeos::UserManager::Get(); | 446 const chromeos::UserManager* user_manager = chromeos::GetUserManager(); |
447 // Skip user image selection for public sessions and ephemeral logins. | 447 // Skip user image selection for public sessions and ephemeral logins. |
448 if (user_manager->IsLoggedInAsPublicAccount() || | 448 if (user_manager->IsLoggedInAsPublicAccount() || |
449 user_manager->IsCurrentUserNonCryptohomeDataEphemeral()) { | 449 user_manager->IsCurrentUserNonCryptohomeDataEphemeral()) { |
450 OnUserImageSkipped(); | 450 OnUserImageSkipped(); |
451 return; | 451 return; |
452 } | 452 } |
453 VLOG(1) << "Showing user image screen."; | 453 VLOG(1) << "Showing user image screen."; |
454 | 454 |
455 bool profile_picture_enabled = true; | 455 bool profile_picture_enabled = true; |
456 std::string user_id; | 456 std::string user_id; |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
520 void WizardController::ShowKioskAutolaunchScreen() { | 520 void WizardController::ShowKioskAutolaunchScreen() { |
521 VLOG(1) << "Showing kiosk autolaunch screen."; | 521 VLOG(1) << "Showing kiosk autolaunch screen."; |
522 SetStatusAreaVisible(false); | 522 SetStatusAreaVisible(false); |
523 SetCurrentScreen(GetKioskAutolaunchScreen()); | 523 SetCurrentScreen(GetKioskAutolaunchScreen()); |
524 } | 524 } |
525 | 525 |
526 void WizardController::ShowTermsOfServiceScreen() { | 526 void WizardController::ShowTermsOfServiceScreen() { |
527 // Only show the Terms of Service when logging into a public account and Terms | 527 // Only show the Terms of Service when logging into a public account and Terms |
528 // of Service have been specified through policy. In all other cases, advance | 528 // of Service have been specified through policy. In all other cases, advance |
529 // to the user image screen immediately. | 529 // to the user image screen immediately. |
530 if (!chromeos::UserManager::Get()->IsLoggedInAsPublicAccount() || | 530 if (!chromeos::GetUserManager()->IsLoggedInAsPublicAccount() || |
531 !ProfileManager::GetActiveUserProfile()->GetPrefs()-> | 531 !ProfileManager::GetActiveUserProfile()->GetPrefs()->IsManagedPreference( |
532 IsManagedPreference(prefs::kTermsOfServiceURL)) { | 532 prefs::kTermsOfServiceURL)) { |
533 ShowUserImageScreen(); | 533 ShowUserImageScreen(); |
534 return; | 534 return; |
535 } | 535 } |
536 | 536 |
537 VLOG(1) << "Showing Terms of Service screen."; | 537 VLOG(1) << "Showing Terms of Service screen."; |
538 SetStatusAreaVisible(true); | 538 SetStatusAreaVisible(true); |
539 SetCurrentScreen(GetTermsOfServiceScreen()); | 539 SetCurrentScreen(GetTermsOfServiceScreen()); |
540 } | 540 } |
541 | 541 |
542 void WizardController::ShowWrongHWIDScreen() { | 542 void WizardController::ShowWrongHWIDScreen() { |
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1256 bool WizardController::SetOnTimeZoneResolvedForTesting( | 1256 bool WizardController::SetOnTimeZoneResolvedForTesting( |
1257 const base::Closure& callback) { | 1257 const base::Closure& callback) { |
1258 if (timezone_resolved_) | 1258 if (timezone_resolved_) |
1259 return false; | 1259 return false; |
1260 | 1260 |
1261 on_timezone_resolved_for_testing_ = callback; | 1261 on_timezone_resolved_for_testing_ = callback; |
1262 return true; | 1262 return true; |
1263 } | 1263 } |
1264 | 1264 |
1265 } // namespace chromeos | 1265 } // namespace chromeos |
OLD | NEW |