Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 669623006: Add a "device disabled" OOBE screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/resources/chromeos/login/login.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 641a706305f766ae3884c8967d1723ea78f352b4..edd6af9c9c57e3d7f7e4ee74014bf7129fffee52 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -33,6 +33,7 @@
#include "chrome/browser/chromeos/login/hwid_checker.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/screens/controller_pairing_screen.h"
+#include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
#include "chrome/browser/chromeos/login/screens/error_screen.h"
#include "chrome/browser/chromeos/login/screens/eula_screen.h"
#include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
@@ -166,6 +167,7 @@ const char WizardController::kHIDDetectionScreenName[] = "hid-detection";
const char WizardController::kControllerPairingScreenName[] =
"controller-pairing";
const char WizardController::kHostPairingScreenName[] = "host-pairing";
+const char WizardController::kDeviceDisabledScreenName[] = "device-disabled";
// static
const int WizardController::kMinAudibleOutputVolumePercent = 10;
@@ -347,7 +349,11 @@ BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
return new HostPairingScreen(this,
oobe_display_->GetHostPairingScreenActor(),
remora_controller_.get());
+ } else if (screen_name == kDeviceDisabledScreenName) {
+ return new chromeos::DeviceDisabledScreen(
+ this, oobe_display_->GetDeviceDisabledScreenActor());
}
+
return NULL;
}
@@ -517,6 +523,12 @@ void WizardController::ShowHostPairingScreen() {
SetCurrentScreen(GetScreen(kHostPairingScreenName));
}
+void WizardController::ShowDeviceDisabledScreen() {
+ VLOG(1) << "Showing device disabled screen.";
+ SetStatusAreaVisible(true);
+ SetCurrentScreen(GetScreen(kDeviceDisabledScreenName));
+}
+
void WizardController::SkipToLoginForTesting(
const LoginScreenContext& context) {
VLOG(1) << "SkipToLoginForTesting.";
@@ -894,6 +906,8 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) {
ShowControllerPairingScreen();
} else if (screen_name == kHostPairingScreenName) {
ShowHostPairingScreen();
+ } else if (screen_name == kDeviceDisabledScreenName) {
+ ShowDeviceDisabledScreen();
} else if (screen_name != kTestNoScreenName) {
if (is_out_of_box_) {
time_oobe_started_ = base::Time::Now();
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/resources/chromeos/login/login.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698