diff options
author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:35:49 +0000 |
---|---|---|
committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:35:49 +0000 |
commit | d2a1a54bca715abec352482151f71939ad901442 (patch) | |
tree | f0da4b54dd12639f36177d2a56794f09ef53738d /chrome/browser/chromeos/policy/auto_enrollment_client.h | |
parent | 226d79ad99a3fba983b13b627df0c61d36a2dfa8 (diff) | |
download | chromium_src-d2a1a54bca715abec352482151f71939ad901442.zip chromium_src-d2a1a54bca715abec352482151f71939ad901442.tar.gz chromium_src-d2a1a54bca715abec352482151f71939ad901442.tar.bz2 |
Wire up forced re-enrollment in OOBE.
This changes the OOBE flow to wait for the auto-enrollment check to
complete. If successful, proceed to sign-in or enrollment depending on
the result of the check. If there's a network error, show the new
variant of the error screen telling the user that they need to connect
to a network on which we can make a successful connection to Google.
BUG=351663
Review URL: https://codereview.chromium.org/200313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/policy/auto_enrollment_client.h')
-rw-r--r-- | chrome/browser/chromeos/policy/auto_enrollment_client.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.h b/chrome/browser/chromeos/policy/auto_enrollment_client.h index 0c8a0e8..39c07f6 100644 --- a/chrome/browser/chromeos/policy/auto_enrollment_client.h +++ b/chrome/browser/chromeos/policy/auto_enrollment_client.h @@ -79,9 +79,8 @@ class AutoEnrollmentClient static bool IsDisabled(); // Convenience method to create instances of this class. - // TODO(mnissler): Convert callers to pass a ProgressCallback here. static AutoEnrollmentClient* Create( - const base::Closure& completion_callback); + const ProgressCallback& progress_callback); // Cancels auto-enrollment. // This function does not interrupt a running auto-enrollment check. It only @@ -98,13 +97,6 @@ class AutoEnrollmentClient // |this| will delete itself. void CancelAndDeleteSoon(); - // Returns true if the protocol completed successfully and determined that - // this device should do enterprise enrollment. - // TODO(mnissler): Remove once callers have been converted to state(). - bool should_auto_enroll() const { - return state_ == STATE_TRIGGER_ENROLLMENT; - }; - // Returns the device_id randomly generated for the auto-enrollment requests. // It can be reused for subsequent requests to the device management service. std::string device_id() const { return device_id_; } |