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

chrome/browser/chromeos/background/ash_user_wallpaper_delegate.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/background/ash_user_wallpaper_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/wm/window_animations.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 namespace {
 
-class UserWallpaperDelegate: public ash::UserWallpaperDelegate {
+class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
  public:
-  UserWallpaperDelegate() {
+  UserWallpaperDelegate() : boot_animation_finished_(false) {
   }
 
   virtual ~UserWallpaperDelegate() {
   }
 
   virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
+    if (chromeos::UserManager::Get()->IsUserLoggedIn() ||

[Ben Goodger (Google), 2012/08/02 15:38:39]

It's becoming hard to discern the intent of this function given the complexity
of the conditions. It'd be nice if we could somehow write this using anonymous
helper functions that express intent... 

e.g. 

if (NormalChange())
  return FADE;
elif (FirstBoot())
  return GRAYSCALE;

etc. Up to you. As it stands, it's a little hard to grok all the conditions
here, and seems like it might be easy to inadvertedly break.

[Nikita (slow), 2012/08/02 17:58:57]

Done.

+        boot_animation_finished_ ||
+        CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableNewOobe) ||
-        WizardController::IsZeroDelayEnabled()) {
+        WizardController::IsZeroDelayEnabled() ||
+        !CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kLoginManager)) {
       return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
     }
 
     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;

[Ben Goodger (Google), 2012/08/02 15:38:39]

no else after return.

[Nikita (slow), 2012/08/02 17:58:57]

Done.

   }
 
   virtual void InitializeWallpaper() OVERRIDE {
     chromeos::UserManager::Get()->InitializeWallpaper();
   }
 
   virtual void OpenSetWallpaperPage() OVERRIDE {
     wallpaper_manager_util::OpenWallpaperManager();
   }
 
   virtual bool CanOpenSetWallpaperPage() OVERRIDE {
     return !chromeos::UserManager::Get()->IsLoggedInAsGuest();
   }
 
   virtual void OnWallpaperAnimationFinished() OVERRIDE {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
         content::NotificationService::AllSources(),
         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);
 };
 
 }  // namespace
 
 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
   return new chromeos::UserWallpaperDelegate();
 }
 
 }  // namespace chromeos