| 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 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 } | 601 } |
| 602 | 602 |
| 603 void WizardController::ShowSupervisedUserCreationScreen() { | 603 void WizardController::ShowSupervisedUserCreationScreen() { |
| 604 VLOG(1) << "Showing Locally managed user creation screen screen."; | 604 VLOG(1) << "Showing Locally managed user creation screen screen."; |
| 605 SetStatusAreaVisible(true); | 605 SetStatusAreaVisible(true); |
| 606 SetCurrentScreen(GetScreen(kSupervisedUserCreationScreenName)); | 606 SetCurrentScreen(GetScreen(kSupervisedUserCreationScreenName)); |
| 607 } | 607 } |
| 608 | 608 |
| 609 void WizardController::ShowHIDDetectionScreen() { | 609 void WizardController::ShowHIDDetectionScreen() { |
| 610 VLOG(1) << "Showing HID discovery screen."; | 610 VLOG(1) << "Showing HID discovery screen."; |
| 611 // TODO(drcrash): Remove this after testing (http://crbug.com/647411). | |
| 612 SetShowMdOobe(false); // Disable the MD OOBE from there on. | |
| 613 SetStatusAreaVisible(true); | 611 SetStatusAreaVisible(true); |
| 614 SetCurrentScreen(GetScreen(kHIDDetectionScreenName)); | 612 SetCurrentScreen(GetScreen(kHIDDetectionScreenName)); |
| 615 // In HID detection screen, puts the Bluetooth in discoverable mode and waits | 613 // In HID detection screen, puts the Bluetooth in discoverable mode and waits |
| 616 // for the incoming Bluetooth connection request. See the comments in | 614 // for the incoming Bluetooth connection request. See the comments in |
| 617 // WizardController::ShowNetworkScreen() for more details. | 615 // WizardController::ShowNetworkScreen() for more details. |
| 618 MaybeStartListeningForSharkConnection(); | 616 MaybeStartListeningForSharkConnection(); |
| 619 } | 617 } |
| 620 | 618 |
| 621 void WizardController::ShowControllerPairingScreen() { | 619 void WizardController::ShowControllerPairingScreen() { |
| 622 VLOG(1) << "Showing controller pairing screen."; | 620 VLOG(1) << "Showing controller pairing screen."; |
| (...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1501 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; | 1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; |
| 1502 } | 1500 } |
| 1503 | 1501 |
| 1504 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
| 1505 screen->SetParameters(effective_config, shark_controller_.get()); | 1503 screen->SetParameters(effective_config, shark_controller_.get()); |
| 1506 SetStatusAreaVisible(true); | 1504 SetStatusAreaVisible(true); |
| 1507 SetCurrentScreen(screen); | 1505 SetCurrentScreen(screen); |
| 1508 } | 1506 } |
| 1509 | 1507 |
| 1510 } // namespace chromeos | 1508 } // namespace chromeos |
| OLD | NEW |