| 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 55e69dd8c17f919c55b9857832c8b3b4443dd072..59b14031ee0bf9093145b5a6dec04a60d2d2bf64 100644
|
| --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| @@ -59,7 +59,8 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
|
| HasSwitch(switches::kDisableBootAnimation);
|
| bool disable_oobe_animation = command_line->
|
| HasSwitch(switches::kDisableOobeAnimation);
|
| - if (disable_oobe_animation || (is_registered && disable_boot_animation))
|
| + if ((!is_registered && disable_oobe_animation) ||
|
| + (is_registered && disable_boot_animation))
|
| return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
|
|
|
| return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE;
|
|
|