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

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 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/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 735 matching lines @@
                               const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED:
       if (!device_local_account_policy_service_) {
         device_local_account_policy_service_ =
             g_browser_process->browser_policy_connector()->
                 GetDeviceLocalAccountPolicyService();
         if (device_local_account_policy_service_)
           device_local_account_policy_service_->AddObserver(this);
       }
-      CheckOwnership();
       RetrieveTrustedDevicePolicies();
+      UpdateOwnership();
       break;
     case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED:
       if (IsUserLoggedIn() &&
           !IsLoggedInAsGuest() &&
           !IsLoggedInAsKioskApp()) {
         Profile* profile = content::Details<Profile>(details).ptr();
         if (!profile->IsOffTheRecord() &&
             profile == ProfileManager::GetDefaultProfile()) {
           // TODO(nkostylev): We should observe all logged in user's profiles.
           // http://crbug.com/230860
@@ skipping 552 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::Source<UserManager>(this),
       content::Details<const User>(active_user_));
 
   // Indicate to DeviceSettingsService that the owner key may have become
   // available.
   DeviceSettingsService::Get()->SetUsername(active_user_->email());
 }
 
-void UserManagerImpl::UpdateOwnership(
-    DeviceSettingsService::OwnershipStatus status,
-    bool is_owner) {
+void UserManagerImpl::UpdateOwnership() {
+  bool is_owner = DeviceSettingsService::Get()->HasPrivateOwnerKey();
   VLOG(1) << "Current user " << (is_owner ? "is owner" : "is not owner");
 
   SetCurrentUserIsOwner(is_owner);
 }
 
-void UserManagerImpl::CheckOwnership() {
-  DeviceSettingsService::Get()->GetOwnershipStatusAsync(
-      base::Bind(&UserManagerImpl::UpdateOwnership,
-                 base::Unretained(this)));
-}
-
 void UserManagerImpl::RemoveNonCryptohomeData(const std::string& email) {
   WallpaperManager::Get()->RemoveUserWallpaperInfo(email);
   user_image_manager_->DeleteUserImage(email);
 
   PrefService* prefs = g_browser_process->local_state();
   DictionaryPrefUpdate prefs_oauth_update(prefs, kUserOAuthTokenStatus);
   int oauth_status;
   prefs_oauth_update->GetIntegerWithoutPathExpansion(email, &oauth_status);
   prefs_oauth_update->RemoveWithoutPathExpansion(email, NULL);
 
@@ skipping 463 matching lines @@
         base::TimeTicks::Now() - manager_creation_time_;
     if (!last_email.empty() && email != last_email &&
         time_to_login.InSeconds() <= kLogoutToLoginDelayMaxSec) {
       UMA_HISTOGRAM_CUSTOM_COUNTS("UserManager.LogoutToLoginDelay",
           time_to_login.InSeconds(), 0, kLogoutToLoginDelayMaxSec, 50);
     }
   }
 }
 
 }  // namespace chromeos