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

chrome/browser/chromeos/login/wallpaper_manager.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/wallpaper_manager.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 180 matching lines @@
                              type, index, last_modification_date);
 }
 
 void WallpaperManager::InitializeWallpaper() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UserManager* user_manager = UserManager::Get();
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
     WizardController::SetZeroDelays();
 
+  // Zero delays is also set in autotests.
+  if (WizardController::IsZeroDelayEnabled())
+    return;
+
+  bool disable_new_oobe = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableNewOobe);
+  bool disable_boot_animation = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableBootAnimation);
+
   if (!user_manager->IsUserLoggedIn()) {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDisableNewOobe)) {
-      if (!WizardController::IsDeviceRegistered() &&
-          !WizardController::IsZeroDelayEnabled()) {
-        // TODO(nkostylev): Add switch to disable wallpaper transition on OOBE.
-        // Should be used on test images so that they are not slowed down.
+    if (!disable_new_oobe) {
+      if (!WizardController::IsDeviceRegistered()) {
         ash::Shell::GetInstance()->desktop_background_controller()->
             SetDefaultWallpaper(kDefaultOOBEWallpaperIndex, false);
       } 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(), false);
+              SetDefaultWallpaper(kDefaultOOBEWallpaperIndex, false);
+        } else if (!disable_boot_animation) {
+          // Normal boot, load user wallpaper.
+          // If normal boot animation is disabled wallpaper would be set
+          // asynchronously once user pods are loaded.
+          const chromeos::UserList& users = user_manager->GetUsers();
+          if (!users.empty()) {
+            SetUserWallpaper(users[0]->email());
+          } else {
+            ash::Shell::GetInstance()->desktop_background_controller()->
+                SetDefaultWallpaper(kDefaultOOBEWallpaperIndex, false);
+          }
         }
       }
     }
     return;
   }
   SetUserWallpaper(user_manager->GetLoggedInUser().email());
 }
 
 void WallpaperManager::Observe(int type,
                                const content::NotificationSource& source,
@@ skipping 349 matching lines @@
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos