HID-detection screen moved to screenContext.

chrome/browser/chromeos/login/wizard_controller.h

Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index ace3c968f3f75e2d2e3681176cb6bb4f5bca9f3c..fa1f7ad0337b00553cb77c9f3513fc00f51f31c3 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -23,6 +23,7 @@
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
+#include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
 #include "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
@@ -59,7 +60,8 @@ class WizardController : public BaseScreenDelegate,
                          public EulaScreen::Delegate,
                          public ControllerPairingScreen::Delegate,
                          public HostPairingScreen::Delegate,
-                         public NetworkScreen::Delegate {
+                         public NetworkScreen::Delegate,
+                         public HIDDetectionScreen::Delegate {
  public:
   // Observes screen changes.
   class Observer {
@@ -181,9 +183,6 @@ class WizardController : public BaseScreenDelegate,
   // Shows images login screen.
   void ShowLoginScreen(const LoginScreenContext& context);
 
-  // Invokes corresponding first OOBE screen.
-  void OnHIDScreenNecessityCheck(bool screen_needed);
-
   // Exit handlers:
   void OnHIDDetectionCompleted();
   void OnNetworkConnected();
@@ -257,6 +256,9 @@ class WizardController : public BaseScreenDelegate,
   // Override from NetworkScreen::Delegate:
   void OnEnableDebuggingScreenRequested() override;
 
+  // Override from HIDDetectionScreen::Delegate
+  void OnHIDScreenNecessityCheck(bool screen_needed) override;
+
   // Notification of a change in the state of an accessibility setting.
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
@@ -420,6 +422,8 @@ class WizardController : public BaseScreenDelegate,
   scoped_ptr<pairing_chromeos::SharkConnectionListener>
       shark_connection_listener_;
 
+  BaseScreen* hid_screen_;
+
   base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);