Fix double wallpaper animation for public pods

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 1152 matching lines @@
       local_state->GetList(kRegularUsers);
   const base::ListValue* prefs_public_accounts =
       local_state->GetList(kPublicAccounts);
   const base::DictionaryValue* prefs_display_names =
       local_state->GetDictionary(kUserDisplayName);
   const base::DictionaryValue* prefs_given_names =
       local_state->GetDictionary(kUserGivenName);
   const base::DictionaryValue* prefs_display_emails =
       local_state->GetDictionary(kUserDisplayEmail);
 
+  // Load public accounts first.

[bartfab (slow), 2014/02/19 14:24:22]

Nit: We call them "public sessions" now. Could you change that in the code and
comment that you are moving?

[Nikita (slow), 2014/02/19 14:34:59]

Done.

+  std::vector<std::string> public_accounts;
+  std::set<std::string> public_accounts_set;
+  ParseUserList(*prefs_public_accounts, std::set<std::string>(),
+                &public_accounts, &public_accounts_set);
+  for (std::vector<std::string>::const_iterator it = public_accounts.begin();
+       it != public_accounts.end(); ++it) {
+    users_.push_back(User::CreatePublicAccountUser(*it));
+    UpdatePublicAccountDisplayName(*it);
+  }
+
   // Load regular users and locally managed users.
   std::vector<std::string> regular_users;
   std::set<std::string> regular_users_set;
-  ParseUserList(*prefs_regular_users, std::set<std::string>(),
+  ParseUserList(*prefs_regular_users, public_accounts_set,
                 &regular_users, &regular_users_set);
   for (std::vector<std::string>::const_iterator it = regular_users.begin();
        it != regular_users.end(); ++it) {
     User* user = NULL;
     const std::string domain = gaia::ExtractDomainName(*it);
     if (domain == UserManager::kLocallyManagedUserDomain)
       user = User::CreateLocallyManagedUser(*it);
     else
       user = User::CreateRegularUser(*it);
     user->set_oauth_token_status(LoadUserOAuthStatus(*it));
@@ skipping 11 matching lines @@
       user->set_given_name(given_name);
     }
 
     std::string display_email;
     if (prefs_display_emails->GetStringWithoutPathExpansion(*it,
                                                             &display_email)) {
       user->set_display_email(display_email);
     }
   }
 
-  // Load public accounts.
-  std::vector<std::string> public_accounts;
-  std::set<std::string> public_accounts_set;
-  ParseUserList(*prefs_public_accounts, regular_users_set,
-                &public_accounts, &public_accounts_set);
-  for (std::vector<std::string>::const_iterator it = public_accounts.begin();
-       it != public_accounts.end(); ++it) {
-    users_.push_back(User::CreatePublicAccountUser(*it));
-    UpdatePublicAccountDisplayName(*it);
-  }
   user_loading_stage_ = STAGE_LOADED;
 
   for (UserList::iterator ui = users_.begin(), ue = users_.end();
        ui != ue; ++ui) {
     GetUserImageManager((*ui)->email())->LoadUserImage();
   }
 }
 
 void UserManagerImpl::RetrieveTrustedDevicePolicies() {
   ephemeral_users_enabled_ = false;
@@ skipping 773 matching lines @@
   if (User* user = FindUserAndModify(user_id))
     user->SetAccountLocale(resolved_locale);
 }
 
 void UserManagerImpl::UpdateNumberOfUsers() {
   base::debug::SetCrashKeyValue(crash_keys::kNumberOfUsers,
       base::StringPrintf("%" PRIuS, GetLoggedInUsers().size()));
 }
 
 }  // namespace chromeos