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

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

Issue 10096012: [cros] Add Ctrl+Alt+E shortcut to Welcome/EULA screen that cancels update and starts with enrollment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 8 years, 8 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/screen_observer.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 ffc4e5cca3d9bc8a6dee2e44a9e9d682179599ba..08b9f300afe6aeff903f8d1f75ab331e46c2bc55 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -90,6 +90,9 @@ class WizardController : public ScreenObserver {
// If being at register screen proceeds to the next one.
void SkipRegistration();
+ // Skip update, go straight to enrollment after EULA is accepted.
+ void SkipUpdateEnrollAfterEula();
+
// Lazy initializers and getters for screens.
NetworkScreen* GetNetworkScreen();
UpdateScreen* GetUpdateScreen();
@@ -149,13 +152,20 @@ class WizardController : public ScreenObserver {
// Shows update screen and starts update process.
void InitiateOOBEUpdate();
+ // Actions that should be done right after EULA is accepted,
+ // before update check.
+ void PerformPostEulaActions();
+
+ // Actions that should be done right after update stage is finished.
+ void PerformPostUpdateActions();
+
// Overridden from ScreenObserver:
virtual void OnExit(ExitCodes exit_code) OVERRIDE;
virtual void ShowCurrentScreen() OVERRIDE;
virtual void OnSetUserNamePassword(const std::string& username,
const std::string& password) OVERRIDE;
- virtual void set_usage_statistics_reporting(bool val) OVERRIDE;
- virtual bool usage_statistics_reporting() const OVERRIDE;
+ virtual void SetUsageStatisticsReporting(bool val) OVERRIDE;
+ virtual bool GetUsageStatisticsReporting() const OVERRIDE;
// Switches from one screen to another.
void SetCurrentScreen(WizardScreen* screen);
@@ -215,6 +225,10 @@ class WizardController : public ScreenObserver {
// during wizard lifetime.
bool usage_statistics_reporting_;
+ // If true then update check is cancelled and enrollment is started after
+ // EULA is accepted.
+ bool skip_update_enroll_after_eula_;
+
// Time when the EULA was accepted. Used to measure the duration from the EULA
// acceptance until the Sign-In screen is displayed.
base::Time time_eula_accepted_;
« no previous file with comments | « chrome/browser/chromeos/login/screen_observer.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698