Enable wallpaper boot animation for boot into sign in too. Add flag to disable it.

chrome/browser/chromeos/login/user_manager_impl.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/user_manager_impl.h"
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
@@ skipping 358 matching lines @@
   is_current_user_new_ = true;
   is_current_user_ephemeral_ = true;
   logged_in_user_ = CreateUser(email, /* is_ephemeral= */ true);
   SetInitialUserImage(email);
   SetInitialUserWallpaper(email);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::InitializeWallpaper() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  if (WizardController::IsZeroDelayEnabled())
+    return;
+
+  bool disable_new_oobe = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableNewOobe);
+  bool disable_boot_animation = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableBootAnimation);
+
   if (!IsUserLoggedIn()) {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDisableNewOobe)) {
-      if (!WizardController::IsDeviceRegistered() &&
-          !WizardController::IsZeroDelayEnabled()) {
+    if (!disable_new_oobe) {
+      if (!WizardController::IsDeviceRegistered()) {
         // TODO(nkostylev): Add switch to disable wallpaper transition on OOBE.
         // Should be used on test images so that they are not slowed down.
         ash::Shell::GetInstance()->desktop_background_controller()->
             SetDefaultWallpaper(kDefaultOOBEWallpaperIndex);
       } else {
         bool show_users = true;
         bool result = CrosSettings::Get()->GetBoolean(
             kAccountsPrefShowUserNamesOnSignIn, &show_users);
         DCHECK(result) << "Unable to fetch setting "
                        << kAccountsPrefShowUserNamesOnSignIn;
         if (!show_users) {
+          // Boot into sign in form, preload default wallpaper.
           ash::Shell::GetInstance()->desktop_background_controller()->
-              SetDefaultWallpaper(ash::GetSolidColorIndex());
+              SetDefaultWallpaper(kDefaultOOBEWallpaperIndex);
+        } else if (!disable_boot_animation) {
+          // Normal boot, load user wallpaper.
+          const chromeos::UserList& users = GetUsers();
+          if (!users.empty()) {
+            UserSelected(users[0]->email());
+          } else {
+            ash::Shell::GetInstance()->desktop_background_controller()->
+                SetDefaultWallpaper(kDefaultOOBEWallpaperIndex);
+          }
         }
       }
     }
     return;
   }
   UserSelected(GetLoggedInUser().email());
 }
 
 void UserManagerImpl::UserSelected(const std::string& email) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 1282 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos