Allow re-enrollment to the same domain in case of policy data loss.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 438 matching lines @@
   if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
     OwnershipService::GetSharedInstance()->GetStatusAsync(
         base::Bind(&ExistingUserController::OnEnrollmentOwnershipCheckCompleted,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
 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 == OwnershipService::OWNERSHIP_TAKEN)?

[pastarmovj, 2012/06/08 09:54:32]

OwnershipServoce::GetStatusAsync is guaranteed to return with a valid status
which is either OWNERSHIP_NONE or ..._TAKEN so the else here is justified.

[Mattias Nissler (ping if slow), 2012/06/08 12:06:11]

I'm aware of that. To somebody new to this, it may be less obvious, which is why
I ask you to spell out your intention clearly.

[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 eats another line by itself. :(

+            &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,
                                                   const std::string& user) {
   DictionaryValue* params = NULL;
   if (is_auto_enrollment) {
     params = new DictionaryValue;
     params->SetBoolean("is_auto_enrollment", true);
     params->SetString("user", user);
   }
@@ skipping 399 matching lines @@
   // Invalidate OAuth token, since it can't be correct after password is
   // changed.
   UserManager::Get()->SaveUserOAuthStatus(username,
                                           User::OAUTH_TOKEN_STATUS_INVALID);
 
   login_display_->SetUIEnabled(true);
   login_display_->ShowGaiaPasswordChanged(username);
 }
 
 }  // namespace chromeos