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 ab80ba1ae33078068bd24b79ef545c3edbbe5118..0a4b8c6d66d51653f2a70469bb0e1a1d168ea312 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/login/screens/reset_screen.h" |
@@ -60,7 +61,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 { |
@@ -182,9 +184,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(); |
@@ -258,6 +257,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); |
@@ -421,6 +423,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); |