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 4275d6db4652301feca03b0c36cce205123db359..02387ef2dcbc62cf859545985586a93f7e9726e3 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); |
|
dzhioev (left Google)
2014/04/25 10:59:59
You wrote in description that several features are
merkulova
2014/04/25 11:37:20
Current state covers most of use-cases, widening p
|
| +} |
| + |
| } // namespace |
| namespace chromeos { |
| @@ -772,7 +780,11 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) { |
| ShowHIDDetectionScreen(); |
| } else if (screen_name != kTestNoScreenName) { |
| if (is_out_of_box_) { |
| - ShowNetworkScreen(); |
| + if (CanShowHIDDetectionScreen()) { |
| + ShowHIDDetectionScreen(); |
| + } else { |
| + ShowNetworkScreen(); |
| + } |
| } else { |
| ShowLoginScreen(LoginScreenContext()); |
| } |