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 4fe6eaf447e3217de757ea04c7913c2b5ee7e876..147667a179f3c09d975566daf2d6e8ab8f800bf3 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller.cc |
+++ b/chrome/browser/chromeos/login/wizard_controller.cc |
@@ -99,8 +99,8 @@ const char *kResumableScreens[] = { |
// Checks flag for HID-detection screen show. |
bool CanShowHIDDetectionScreen() { |
- return CommandLine::ForCurrentProcess()->HasSwitch( |
- chromeos::switches::kEnableHIDDetectionOnOOBE); |
+ return !CommandLine::ForCurrentProcess()->HasSwitch( |
+ chromeos::switches::kDisableHIDDetectionOnOOBE); |
} |
bool IsResumableScreen(const std::string& screen) { |
@@ -545,7 +545,9 @@ void WizardController::SkipUpdateEnrollAfterEula() { |
/////////////////////////////////////////////////////////////////////////////// |
// WizardController, ExitHandlers: |
void WizardController::OnHIDDetectionCompleted() { |
- ShowNetworkScreen(); |
+ // Check for tests configuration. |
+ if (!StartupUtils::IsOobeCompleted()) |
+ ShowNetworkScreen(); |
} |
void WizardController::OnNetworkConnected() { |