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

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

Issue 387403003: Fix UI glitches in enterprise enrollment recovery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 5 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 | « no previous file | 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 492fd2e9d8afb1e801412c386ef2a347e1cbc45c..8d298b45375ea8bae517dd267a759185c20e9d6e 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -101,9 +101,13 @@ class WizardController : public ScreenObserver {
// Checks whether OOBE should start enrollment automatically.
static bool ShouldAutoStartEnrollment();
- // Checks whether OOBE should recover enrollment.
+ // Checks whether OOBE should recover enrollment. Note that this flips to
+ // false once device policy has been restored as a part of recovery.
static bool ShouldRecoverEnrollment();
+ // Obtains domain the device used to be enrolled to from install attributes.
+ static std::string GetEnrollmentRecoveryDomain();
+
// Shows the first screen defined by |first_screen_name| or by default
// if the parameter is empty. Takes ownership of |screen_parameters|.
void Init(const std::string& first_screen_name,
@@ -373,6 +377,10 @@ class WizardController : public ScreenObserver {
// EULA is accepted.
bool skip_update_enroll_after_eula_;
+ // Whether enrollment will be or has been recovered in the current wizard
+ // instance.
+ bool enrollment_recovery_;
+
// 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 | « no previous file | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698