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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 if (!remora_controller_) { | 425 if (!remora_controller_) { |
426 remora_controller_.reset( | 426 remora_controller_.reset( |
427 new pairing_chromeos::BluetoothHostPairingController( | 427 new pairing_chromeos::BluetoothHostPairingController( |
428 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE))); | 428 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE))); |
429 remora_controller_->StartPairing(); | 429 remora_controller_->StartPairing(); |
430 } | 430 } |
431 return new HostPairingScreen(this, this, | 431 return new HostPairingScreen(this, this, |
432 oobe_ui_->GetHostPairingScreenView(), | 432 oobe_ui_->GetHostPairingScreenView(), |
433 remora_controller_.get()); | 433 remora_controller_.get()); |
434 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) { | 434 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) { |
435 return new DeviceDisabledScreen(this, | 435 auto* result = new DeviceDisabledScreen(this, oobe_ui_->GetCoreOobeView()); |
436 oobe_ui_->GetDeviceDisabledScreenView()); | 436 screen_manager_.AddDelegate(result); |
| 437 return result; |
437 } | 438 } |
438 | 439 |
439 return nullptr; | 440 return nullptr; |
440 } | 441 } |
441 | 442 |
442 void WizardController::ShowNetworkScreen() { | 443 void WizardController::ShowNetworkScreen() { |
443 VLOG(1) << "Showing network screen."; | 444 VLOG(1) << "Showing network screen."; |
444 // Hide the status area initially; it only appears after OOBE first animates | 445 // Hide the status area initially; it only appears after OOBE first animates |
445 // in. Keep it visible if the user goes back to the existing network screen. | 446 // in. Keep it visible if the user goes back to the existing network screen. |
446 SetStatusAreaVisible( | 447 SetStatusAreaVisible( |
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1521 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; | 1522 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; |
1522 } | 1523 } |
1523 | 1524 |
1524 EnrollmentScreen* screen = EnrollmentScreen::Get(screen_manager()); | 1525 EnrollmentScreen* screen = EnrollmentScreen::Get(screen_manager()); |
1525 screen->SetParameters(effective_config, shark_controller_.get()); | 1526 screen->SetParameters(effective_config, shark_controller_.get()); |
1526 SetStatusAreaVisible(true); | 1527 SetStatusAreaVisible(true); |
1527 SetCurrentScreen(screen); | 1528 SetCurrentScreen(screen); |
1528 } | 1529 } |
1529 | 1530 |
1530 } // namespace chromeos | 1531 } // namespace chromeos |
OLD | NEW |