Chromium Code Reviews| Index: chrome/browser/chromeos/login/existing_user_controller.cc |
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc |
| index b0cd72543b9ffb8b6c836c31ba11618f3c2cf41e..8527f764674a121e00032998f593b0bbb6b44063 100644 |
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc |
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc |
| @@ -456,8 +456,18 @@ void ExistingUserController::OnStartEnterpriseEnrollment() { |
| void ExistingUserController::OnEnrollmentOwnershipCheckCompleted( |
| OwnershipService::Status status, |
| bool current_user_is_owner) { |
| - if (status == OwnershipService::OWNERSHIP_NONE) |
| + if (status == OwnershipService::OWNERSHIP_NONE) { |
| ShowEnrollmentScreen(false, std::string()); |
| + } else { |
|
Mattias Nissler (ping if slow)
2012/06/04 10:17:52
shouldn't this be else if (status == OwnershipServ
pastarmovj
2012/06/08 09:54:32
OwnershipServoce::GetStatusAsync is guaranteed to
Mattias Nissler (ping if slow)
2012/06/08 12:06:11
I'm aware of that. To somebody new to this, it may
pastarmovj
2012/06/08 12:56:39
Done.
|
| + // On a device that is already owned we might want to allow users to |
| + // re-enroll if the policy information has been screwed. |
| + CrosSettingsProvider::TrustedStatus trusted_status = |
| + CrosSettings::Get()->PrepareTrustedValues(base::Bind( |
|
Mattias Nissler (ping if slow)
2012/06/04 10:17:52
nit: can you break before base::Bind?
pastarmovj
2012/06/08 09:54:32
Done. However the huge size of the function name e
|
| + &ExistingUserController::OnEnrollmentOwnershipCheckCompleted, |
| + weak_factory_.GetWeakPtr(), status, current_user_is_owner)); |
| + if (trusted_status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) |
| + ShowEnrollmentScreen(false, std::string()); |
| + } |
| } |
| void ExistingUserController::ShowEnrollmentScreen(bool is_auto_enrollment, |