| Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| index ba12861332255f5a3c938d01ce583a0f14dd36cf..4d0c36382cba14d6d77babd01158a2e1a6f8ccd7 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| @@ -23,6 +23,7 @@ class DictionaryValue;
|
| namespace chromeos {
|
| class AppLaunchSplashScreenActor;
|
| class BaseScreenHandler;
|
| +class ControllerPairingScreenActor;
|
| class ErrorScreenHandler;
|
| class KioskAppMenuHandler;
|
| class KioskEnableScreenActor;
|
| @@ -81,13 +82,12 @@ class OobeUI : public OobeDisplay,
|
| static const char kScreenConfirmPassword[];
|
| static const char kScreenFatalError[];
|
| static const char kScreenHIDDetection[];
|
| + static const char kScreenControllerPairing[];
|
|
|
| OobeUI(content::WebUI* web_ui, const GURL& url);
|
| virtual ~OobeUI();
|
|
|
| // OobeDisplay implementation:
|
| - virtual void ShowScreen(WizardScreen* screen) OVERRIDE;
|
| - virtual void HideScreen(WizardScreen* screen) OVERRIDE;
|
| virtual CoreOobeActor* GetCoreOobeActor() OVERRIDE;
|
| virtual UpdateScreenActor* GetUpdateScreenActor() OVERRIDE;
|
| virtual NetworkScreenActor* GetNetworkScreenActor() OVERRIDE;
|
| @@ -110,6 +110,8 @@ class OobeUI : public OobeDisplay,
|
| virtual bool IsJSReady(const base::Closure& display_is_ready_callback)
|
| OVERRIDE;
|
| virtual HIDDetectionScreenActor* GetHIDDetectionScreenActor() OVERRIDE;
|
| + virtual ControllerPairingScreenActor* GetControllerPairingScreenActor()
|
| + OVERRIDE;
|
|
|
| // Collects localized strings from the owned handlers.
|
| void GetLocalizedStrings(base::DictionaryValue* localized_strings);
|
| @@ -190,6 +192,7 @@ class OobeUI : public OobeDisplay,
|
| LocallyManagedUserCreationScreenHandler*
|
| locally_managed_user_creation_screen_actor_;
|
| AppLaunchSplashScreenActor* app_launch_splash_screen_actor_;
|
| + ControllerPairingScreenActor* controller_pairing_screen_actor_;
|
|
|
| // Reference to ErrorScreenHandler that handles error screen
|
| // requests and forward calls from native code to JS side.
|
|
|