HID-detection screen moved to screenContext.

chrome/browser/chromeos/login/wizard_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/screen_manager.h"
 #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/login/screens/reset_screen.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace pairing_chromeos {
 class ControllerPairingController;
@@ skipping 17 matching lines @@
 class UpdateScreen;
 class UserImageScreen;
 
 // Class that manages control flow between wizard screens. Wizard controller
 // interacts with screen controllers to move the user between screens.
 class WizardController : public BaseScreenDelegate,
                          public ScreenManager,
                          public EulaScreen::Delegate,
                          public ControllerPairingScreen::Delegate,
                          public HostPairingScreen::Delegate,
-                         public NetworkScreen::Delegate {
+                         public NetworkScreen::Delegate,
+                         public HIDDetectionScreen::Delegate {
  public:
   // Observes screen changes.
   class Observer {
    public:
     // Called before a screen change happens.
     virtual void OnScreenChanged(BaseScreen* next_screen) = 0;
 
     // Called after the browser session has started.
     virtual void OnSessionStart() = 0;
   };
@@ skipping 101 matching lines @@
   void ShowAutoEnrollmentCheckScreen();
   void ShowSupervisedUserCreationScreen();
   void ShowHIDDetectionScreen();
   void ShowControllerPairingScreen();
   void ShowHostPairingScreen();
   void ShowDeviceDisabledScreen();
 
   // 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();
   void OnNetworkOffline();
   void OnConnectionFailed();
   void OnUpdateCompleted();
   void OnEulaAccepted();
   void OnUpdateErrorCheckingForUpdate();
   void OnUpdateErrorUpdating();
   void OnUserImageSelected();
@@ skipping 53 matching lines @@
   // Override from HostPairingScreen::Delegate:
   void ConfigureHost(bool accepted_eula,
                      const std::string& lang,
                      const std::string& timezone,
                      bool send_reports,
                      const std::string& keyboard_layout) override;
 
   // 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);
 
   // Switches from one screen to another.
   void SetCurrentScreen(BaseScreen* screen);
 
   // Switches from one screen to another with delay before showing. Calling
   // ShowCurrentScreen directly forces screen to be shown immediately.
   void SetCurrentScreenSmooth(BaseScreen* screen, bool use_smoothing);
@@ skipping 143 matching lines @@
 
   // True if shark device initiated connection to this device.
   bool shark_controller_detected_;
 
   // Listens for incoming connection from a shark controller if a regular (not
   // pairing) remora OOBE is active. If connection is established, wizard
   // conroller swithces to a pairing OOBE.
   scoped_ptr<pairing_chromeos::SharkConnectionListener>
       shark_connection_listener_;
 
+  BaseScreen* hid_screen_;
+
   base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_