From d2a1a54bca715abec352482151f71939ad901442 Mon Sep 17 00:00:00 2001 From: "mnissler@chromium.org" Date: Fri, 14 Mar 2014 21:35:49 +0000 Subject: 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 --- chrome/browser/chromeos/policy/auto_enrollment_client.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'chrome/browser/chromeos/policy/auto_enrollment_client.h') 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_; } -- cgit v1.1