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

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

Issue 10928088: Factory reset screen is added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed formatting Created 8 years, 3 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
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 b83f619727cfe49a8671991ef7f232adb5685125..9af70b367de49d370cf8d915ddc5add68e442cca 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -33,6 +33,7 @@ class LoginDisplayHost;
class NetworkScreen;
class OobeDisplay;
class RegistrationScreen;
+class ResetScreen;
class UpdateScreen;
class UserImageScreen;
class WizardScreen;
@@ -135,6 +136,7 @@ class WizardController : public ScreenObserver {
RegistrationScreen* GetRegistrationScreen();
HTMLPageScreen* GetHTMLPageScreen();
EnterpriseEnrollmentScreen* GetEnterpriseEnrollmentScreen();
+ ResetScreen* GetResetScreen();
// Returns a pointer to the current screen or NULL if there's no such
// screen.
@@ -153,6 +155,7 @@ class WizardController : public ScreenObserver {
static const char kEulaScreenName[];
static const char kHTMLPageScreenName[];
static const char kEnterpriseEnrollmentScreenName[];
+ static const char kResetScreenName[];
private:
// Show specific screen.
@@ -163,6 +166,7 @@ class WizardController : public ScreenObserver {
void ShowRegistrationScreen();
void ShowHTMLPageScreen();
void ShowEnterpriseEnrollmentScreen();
+ void ShowResetScreen();
// Shows images login screen.
void ShowLoginScreen();
@@ -184,6 +188,7 @@ class WizardController : public ScreenObserver {
void OnRegistrationSkipped();
void OnEnterpriseEnrollmentDone();
void OnEnterpriseAutoEnrollmentDone();
+ void OnResetCanceled();
void OnOOBECompleted();
// Shows update screen and starts update process.
@@ -227,6 +232,7 @@ class WizardController : public ScreenObserver {
scoped_ptr<UserImageScreen> user_image_screen_;
scoped_ptr<EulaScreen> eula_screen_;
scoped_ptr<RegistrationScreen> registration_screen_;
+ scoped_ptr<ResetScreen> reset_screen_;
scoped_ptr<HTMLPageScreen> html_page_screen_;
scoped_ptr<EnterpriseEnrollmentScreen>
enterprise_enrollment_screen_;
@@ -234,6 +240,9 @@ class WizardController : public ScreenObserver {
// Screen that's currently active.
WizardScreen* current_screen_;
+ // Screen that was active before, or NULL for login screen.
+ WizardScreen* previous_screen_;
+
std::string username_;
std::string password_;
« no previous file with comments | « chrome/browser/chromeos/login/webui_screen_locker.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698