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

chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

Index: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
index 4ee3feb0caddec08e52fb7753eb98ac01d958725..ba1c5aa50cf4f8c55ebebd6e5408361a125f8e9e 100644
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -26,27 +26,39 @@ namespace chromeos {
 
 namespace {
 
-class UserWallpaperDelegate: public ash::UserWallpaperDelegate {
+bool IsNormalWallpaperChange() {
+  if (chromeos::UserManager::Get()->IsUserLoggedIn() ||
+      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kFirstBoot) ||
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) ||
+      WizardController::IsZeroDelayEnabled() ||
+      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager)) {
+    return true;
+  }
+
+  return false;
+}
+
+class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
  public:
-  UserWallpaperDelegate() {
+  UserWallpaperDelegate() : boot_animation_finished_(false) {
   }
 
   virtual ~UserWallpaperDelegate() {
   }
 
   virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDisableNewOobe) ||
-        WizardController::IsZeroDelayEnabled()) {
+    if (IsNormalWallpaperChange() || boot_animation_finished_)
       return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
-    }
 
+    // It is a first boot case now. If kDisableBootAnimation flag
+    // is passed, it only disables any transition after OOBE.
     bool is_registered = WizardController::IsDeviceRegistered();
-    // TODO(nkostylev): Figure out whether this would affect autotests as well.
-    if (is_registered)
+    bool disable_boot_animation = CommandLine::ForCurrentProcess()->
+        HasSwitch(switches::kDisableBootAnimation);
+    if (is_registered && disable_boot_animation)
       return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
-    else
-      return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE;
+
+    return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE;
   }
 
   virtual void InitializeWallpaper() OVERRIDE {
@@ -68,7 +80,14 @@ class UserWallpaperDelegate: public ash::UserWallpaperDelegate {
         content::NotificationService::NoDetails());
   }
 
+  virtual void OnWallpaperBootAnimationFinished() OVERRIDE {
+    // Make sure that boot animation type is used only once.
+    boot_animation_finished_ = true;
+  }
+
  private:
+  bool boot_animation_finished_;
+
   DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
 };