Postpone loading about:flags ui until the certificates have been loaded

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 335 matching lines @@
   // Do an ownership check now to avoid auto-enrolling if the device has
   // already been owned.
   DeviceSettingsService::Get()->GetOwnershipStatusAsync(
       base::Bind(&ExistingUserController::CompleteLoginInternal,
                  weak_factory_.GetWeakPtr(),
                  user_context));
 }
 
 void ExistingUserController::CompleteLoginInternal(
     const UserContext& user_context,
-    DeviceSettingsService::OwnershipStatus ownership_status,
-    bool is_owner) {
+    DeviceSettingsService::OwnershipStatus ownership_status) {
   // Auto-enrollment must have made a decision by now. It's too late to enroll
   // if the protocol isn't done at this point.
   if (do_auto_enrollment_ &&
       ownership_status == DeviceSettingsService::OWNERSHIP_NONE) {
     VLOG(1) << "Forcing auto-enrollment before completing login";
     // The only way to get out of the enrollment screen from now on is to either
     // complete enrollment, or opt-out of it. So this controller shouldn't force
     // enrollment again if it is reused for another sign-in.
     do_auto_enrollment_ = false;
     auto_enrollment_username_ = user_context.username;
@@ skipping 258 matching lines @@
   NOTREACHED();
 }
 
 void ExistingUserController::OnConsumerKioskModeCheckCompleted(
     KioskAppManager::ConsumerKioskModeStatus status) {
   if (status == KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE)
     ShowKioskEnableScreen();
 }
 
 void ExistingUserController::OnEnrollmentOwnershipCheckCompleted(
-    DeviceSettingsService::OwnershipStatus status,
-    bool current_user_is_owner) {
+    DeviceSettingsService::OwnershipStatus status) {
   if (status == DeviceSettingsService::OWNERSHIP_NONE) {
     ShowEnrollmentScreen(false, std::string());
   } else if (status == DeviceSettingsService::OWNERSHIP_TAKEN) {
     // On a device that is already owned we might want to allow users to
     // re-enroll if the policy information is invalid.
     CrosSettingsProvider::TrustedStatus trusted_status =
         CrosSettings::Get()->PrepareTrustedValues(
             base::Bind(
                 &ExistingUserController::OnEnrollmentOwnershipCheckCompleted,
-                weak_factory_.GetWeakPtr(),
-                status, current_user_is_owner));
+                weak_factory_.GetWeakPtr(), status));
     if (trusted_status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
       ShowEnrollmentScreen(false, std::string());
     }
   } else {
     // OwnershipService::GetStatusAsync is supposed to return either
     // OWNERSHIP_NONE or OWNERSHIP_TAKEN.
     NOTREACHED();
   }
 }
 
@@ skipping 455 matching lines @@
   // changed.
   UserManager::Get()->SaveUserOAuthStatus(
       username,
       User::OAUTH2_TOKEN_STATUS_INVALID);
 
   login_display_->SetUIEnabled(true);
   login_display_->ShowGaiaPasswordChanged(username);
 }
 
 }  // namespace chromeos