Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: chrome/browser/chromeos/login/wizard_controller.h

Issue 326933004: Example of usage of new features of context and screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/ui/oobe_display.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 35741aad44083e8b7a19e58d9a4d84b9d2501476..236330c924425aeeb01209158cb7bfdfa25d6cb6 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -31,6 +31,7 @@ class DictionaryValue;
namespace chromeos {
class AutoEnrollmentCheckScreen;
+class ControllerPairingScreen;
class EnrollmentScreen;
class ErrorScreen;
class EulaScreen;
@@ -128,8 +129,9 @@ class WizardController : public ScreenObserver {
TermsOfServiceScreen* GetTermsOfServiceScreen();
WrongHWIDScreen* GetWrongHWIDScreen();
AutoEnrollmentCheckScreen* GetAutoEnrollmentCheckScreen();
- HIDDetectionScreen* GetHIDDetectionScreen();
LocallyManagedUserCreationScreen* GetLocallyManagedUserCreationScreen();
+ HIDDetectionScreen* GetHIDDetectionScreen();
+ ControllerPairingScreen* GetControllerPairingScreen();
// Returns a pointer to the current screen or NULL if there's no such
// screen.
@@ -155,7 +157,8 @@ class WizardController : public ScreenObserver {
static const char kWrongHWIDScreenName[];
static const char kLocallyManagedUserCreationScreenName[];
static const char kAppLaunchSplashScreenName[];
- static const char kHIDDetectionScreenName [];
+ static const char kHIDDetectionScreenName[];
+ static const char kControllerPairingScreenName[];
// Volume percent at which spoken feedback is still audible.
static const int kMinAudibleOutputVolumePercent;
@@ -175,6 +178,7 @@ class WizardController : public ScreenObserver {
void ShowAutoEnrollmentCheckScreen();
void ShowLocallyManagedUserCreationScreen();
void ShowHIDDetectionScreen();
+ void ShowControllerPairingScreen();
// Shows images login screen.
void ShowLoginScreen(const LoginScreenContext& context);
@@ -203,6 +207,7 @@ class WizardController : public ScreenObserver {
void OnOOBECompleted();
void OnTermsOfServiceDeclined();
void OnTermsOfServiceAccepted();
+ void OnControllerPairingFinished();
// Loads brand code on I/O enabled thread and stores to Local State.
void LoadBrandCodeFromFile();
@@ -310,6 +315,7 @@ class WizardController : public ScreenObserver {
scoped_ptr<LocallyManagedUserCreationScreen>
locally_managed_user_creation_screen_;
scoped_ptr<HIDDetectionScreen> hid_detection_screen_;
+ scoped_ptr<ControllerPairingScreen> controller_pairing_screen_;
// Screen that's currently active.
WizardScreen* current_screen_;
« no previous file with comments | « chrome/browser/chromeos/login/ui/oobe_display.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698