| Index: chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
|
| diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
|
| index 90d6516080b5856b48c138b235beea65e01d5c0b..5017ce7ea16395900721bae7cc3ff1de07aaf6ff 100644
|
| --- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
|
| +++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
|
| @@ -121,34 +121,33 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,
|
| };
|
|
|
| // Handles the response to a request for server-backed state keys.
|
| - void CheckStateKeys(const std::vector<std::string>& state_keys);
|
| + void HandleStateKeysResult(const std::vector<std::string>& state_keys);
|
|
|
| // Starts registration if the store is initialized.
|
| - void AttemptRegistration();
|
| + void StartRegistration();
|
|
|
| - // Handles the policy validation result, proceeding with installation-time
|
| - // attributes locking if successful.
|
| - void PolicyValidated(DeviceCloudPolicyValidator* validator);
|
| + // Handles the policy validation result, proceeding with device lock if
|
| + // successful.
|
| + void HandlePolicyValidationResult(DeviceCloudPolicyValidator* validator);
|
|
|
| - // Calls LockDevice() and proceeds to policy installation. If unsuccessful,
|
| - // reports the result. Actual installation or error report will be done in
|
| - // HandleLockDeviceResult().
|
| + // Calls InstallAttributes::LockDevice() for enterprise enrollment and
|
| + // DeviceSettingsService::SetManagementSettings() for consumer
|
| + // enrollment.
|
| void StartLockDevice();
|
|
|
| // Checks the status after SetManagementSettings() is done. Proceeds to
|
| // robot auth code storing if successful.
|
| - void OnSetManagementSettingsDone();
|
| + void HandleSetManagementSettingsDone();
|
|
|
| - // Helper for StartLockDevice(). It performs the actual action based on
|
| - // the result of LockDevice.
|
| + // Handle callback from InstallAttributes::LockDevice() and retry on failure.
|
| void HandleLockDeviceResult(
|
| EnterpriseInstallAttributes::LockResult lock_result);
|
|
|
| - // Stores robot auth token.
|
| - void StoreRobotAuth();
|
| + // Initiates storing of robot auth token.
|
| + void StartStoreRobotAuth();
|
|
|
| // Handles completion of the robot token store operation.
|
| - void HandleRobotAuthTokenStored(bool result);
|
| + void HandleStoreRobotAuthTokenResult(bool result);
|
|
|
| // Drops any ongoing actions.
|
| void Stop();
|
|
|