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 f02fe2be9171ec04e8ebaafabc408ec68a458772..6f3cbb42f0e36e6d427a5609c838cc2a903b89bc 100644 |
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc |
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc |
@@ -34,8 +34,11 @@ class UserWallpaperDelegate: public ash::UserWallpaperDelegate { |
} |
virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE { |
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) |
+ if (CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDisableNewOobe) || |
+ WizardController::IsZeroDelayEnabled()) { |
return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; |
+ } |
bool is_registered = WizardController::IsDeviceRegistered(); |
// TODO(nkostylev): Figure out whether this would affect autotests as well. |