Base version of HID detection OOBE screen.

chrome/browser/chromeos/login/wizard_controller.cc

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..20b6f4fae8eda1b89074282a645ae27295301c7d 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -11,6 +11,7 @@
 #include <string>
 #include <vector>
 
+#include "ash/shell.h"

[ygorshenin1, 2014/04/24 11:30:24]

nit: not needed here.

[merkulova, 2014/04/24 12:49:46]

Done.

 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ -61,6 +62,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"
@@ -741,6 +743,11 @@ void WizardController::SetStatusAreaVisible(bool visible) {
   host_->SetStatusAreaVisible(visible);
 }
 
+bool WizardController::CanShowHIDDetectionScreen() {
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableHIDDetectionOnOOBE);
+}
+
 void WizardController::AdvanceToScreen(const std::string& screen_name) {
   if (screen_name == kNetworkScreenName) {
     ShowNetworkScreen();
@@ -772,7 +779,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());
     }