Chromium Code Reviews| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdlib.h> | 9 #include <stdlib.h> |
| 10 #include <sys/types.h> | 10 #include <sys/types.h> |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 657 | 657 |
| 658 /////////////////////////////////////////////////////////////////////////////// | 658 /////////////////////////////////////////////////////////////////////////////// |
| 659 // WizardController, ExitHandlers: | 659 // WizardController, ExitHandlers: |
| 660 void WizardController::OnHIDDetectionCompleted() { | 660 void WizardController::OnHIDDetectionCompleted() { |
| 661 // Check for tests configuration. | 661 // Check for tests configuration. |
| 662 if (!StartupUtils::IsOobeCompleted()) | 662 if (!StartupUtils::IsOobeCompleted()) |
| 663 ShowNetworkScreen(); | 663 ShowNetworkScreen(); |
| 664 } | 664 } |
| 665 | 665 |
| 666 void WizardController::OnNetworkConnected() { | 666 void WizardController::OnNetworkConnected() { |
| 667 if (is_official_build_) { | 667 if (!StartupUtils::IsEulaAccepted()) { |
| 668 if (!StartupUtils::IsEulaAccepted()) { | 668 if (is_official_build_) { |
| 669 ShowEulaScreen(); | 669 ShowEulaScreen(); |
| 670 } else { | 670 } else { |
| 671 // Possible cases: | 671 // Follow the same flow as if EULA had been accepted. |
| 672 // 1. EULA was accepted, forced shutdown/reboot during update. | 672 OnEulaAccepted(); |
|
achuithb
2017/04/12 21:09:03
Maybe call this out in the CL description. Somethi
Thiemo Nagel
2017/04/13 04:18:34
Done.
| |
| 673 // 2. EULA was accepted, planned reboot after update. | |
| 674 // Make sure that device is up to date. | |
| 675 InitiateOOBEUpdate(); | |
| 676 } | 673 } |
| 677 } else { | 674 } else { |
| 675 // Possible cases: | |
| 676 // 1. EULA was accepted, forced shutdown/reboot during update. | |
| 677 // 2. EULA was accepted, planned reboot after update. | |
| 678 // Make sure that device is up to date. | |
| 678 InitiateOOBEUpdate(); | 679 InitiateOOBEUpdate(); |
| 679 } | 680 } |
| 680 } | 681 } |
| 681 | 682 |
| 682 void WizardController::OnNetworkOffline() { | 683 void WizardController::OnNetworkOffline() { |
| 683 // TODO(dpolukhin): if(is_out_of_box_) we cannot work offline and | 684 // TODO(dpolukhin): if(is_out_of_box_) we cannot work offline and |
| 684 // should report some error message here and stay on the same screen. | 685 // should report some error message here and stay on the same screen. |
| 685 ShowLoginScreen(LoginScreenContext()); | 686 ShowLoginScreen(LoginScreenContext()); |
| 686 } | 687 } |
| 687 | 688 |
| (...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1533 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; | 1534 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; |
| 1534 } | 1535 } |
| 1535 | 1536 |
| 1536 EnrollmentScreen* screen = EnrollmentScreen::Get(screen_manager()); | 1537 EnrollmentScreen* screen = EnrollmentScreen::Get(screen_manager()); |
| 1537 screen->SetParameters(effective_config, shark_controller_.get()); | 1538 screen->SetParameters(effective_config, shark_controller_.get()); |
| 1538 UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT); | 1539 UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT); |
| 1539 SetCurrentScreen(screen); | 1540 SetCurrentScreen(screen); |
| 1540 } | 1541 } |
| 1541 | 1542 |
| 1542 } // namespace chromeos | 1543 } // namespace chromeos |
| OLD | NEW |