Chromium Code Reviews| 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 e3113bc41b0df382dc453c4b83ad2fd58b476ed2..a67814c86e983c02f03fecb5aa39dd36311e68f0 100644 |
| --- a/chrome/browser/chromeos/login/wizard_controller.cc |
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc |
| @@ -61,6 +61,7 @@ |
| #include "chrome/common/pref_names.h" |
| #include "chromeos/audio/cras_audio_handler.h" |
| #include "chromeos/chromeos_constants.h" |
| +#include "chromeos/chromeos_switches.h" |
| #include "chromeos/dbus/dbus_thread_manager.h" |
| #include "chromeos/dbus/session_manager_client.h" |
| #include "chromeos/network/network_state.h" |
| @@ -84,6 +85,13 @@ static int kShowDelayMs = 400; |
| // Total timezone resolving process timeout. |
| const unsigned int kResolveTimeZoneTimeoutSeconds = 60; |
| + |
| +// Checks flag for HID-detection screen show. |
| +bool CanShowHIDDetectionScreen() { |
| + return !CommandLine::ForCurrentProcess()->HasSwitch( |
| + chromeos::switches::kDisableHIDDetectionOnOOBE); |
| +} |
| + |
| } // namespace |
| namespace chromeos { |
| @@ -776,7 +784,11 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) { |
| ShowHIDDetectionScreen(); |
| } else if (screen_name != kTestNoScreenName) { |
| if (is_out_of_box_) { |
| - ShowNetworkScreen(); |
| + if (CanShowHIDDetectionScreen()) { |
|
ygorshenin1
2014/04/25 15:05:08
nit: curly braces are not needed here.
merkulova
2014/04/25 16:24:28
Done.
|
| + ShowHIDDetectionScreen(); |
| + } else { |
| + ShowNetworkScreen(); |
| + } |
| } else { |
| ShowLoginScreen(LoginScreenContext()); |
| } |