Fix double wallpaper animation for public pods

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1272 matching lines @@
 void SigninScreenHandler::SendUserList(bool animated) {
   if (!delegate_)
     return;
   TRACE_EVENT_ASYNC_STEP_INTO0("ui",
                                "ShowLoginWebUI",
                                LoginDisplayHostImpl::kShowLoginWebUIid,
                                "SendUserList");
   BootTimesLoader::Get()->RecordCurrentStats("login-send-user-list");
 
   base::ListValue users_list;
-  size_t first_non_public_account_index  = 0;
   const UserList& users = delegate_->GetUsers();
 
   // TODO(nkostylev): Move to a separate method in UserManager.
   // http://crbug.com/230852
   bool is_signin_to_add = LoginDisplayHostImpl::default_host() &&
       UserManager::Get()->IsUserLoggedIn();
 
   bool single_user = users.size() == 1;
   std::string owner;
   chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
   bool has_owner = owner.size() > 0;
-  // if public accounts available, that means there's no device owner
   size_t max_non_owner_users = has_owner ? kMaxUsers - 1 : kMaxUsers;
   size_t non_owner_count = 0;
 
   for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
     const std::string& email = (*it)->email();
     bool is_owner = (email == owner);
     bool is_public_account =
         ((*it)->GetType() == User::USER_TYPE_PUBLIC_ACCOUNT);
 
     if (is_public_account || non_owner_count < max_non_owner_users ||
         is_owner) {
       base::DictionaryValue* user_dict = new base::DictionaryValue();
       FillUserDictionary(*it, is_owner, is_signin_to_add, user_dict);
       bool signed_in = (*it)->is_logged_in();
       // Single user check here is necessary because owner info might not be
       // available when running into login screen on first boot.
       // See http://crosbug.com/12723
       bool can_remove_user = !single_user && !email.empty() && !is_owner &&
           !is_public_account && !signed_in && !is_signin_to_add;
       user_dict->SetBoolean(kKeyCanRemove, can_remove_user);
 
       if (!is_owner)
         ++non_owner_count;
-      // public accounts come first in the list
-      if (is_public_account) {
-        users_list.Insert(first_non_public_account_index++, user_dict);
-      } else {
-        users_list.Append(user_dict);
-      }
+
+      users_list.Append(user_dict);
     }
   }
   while (users_list.GetSize() > kMaxUsers)
     users_list.Remove(kMaxUsers, NULL);
 
   CallJS("login.AccountPickerScreen.loadUsers", users_list, animated,
          delegate_->IsShowGuest());
 }
 
 void SigninScreenHandler::HandleAccountPickerReady() {
@@ skipping 383 matching lines @@
   DCHECK(gaia_screen_handler_);
   return gaia_screen_handler_->frame_state();
 }
 
 net::Error SigninScreenHandler::FrameError() const {
   DCHECK(gaia_screen_handler_);
   return gaia_screen_handler_->frame_error();
 }
 
 }  // namespace chromeos