| Index: chrome/browser/chromeos/login/user_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
|
| index 2e67ddd4bac62c874b20a44bba77be4429376daa..9eb7b3c90c51482fdc25525e586937c5ef6ea219 100644
|
| --- a/chrome/browser/chromeos/login/user_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/login/user_manager_impl.cc
|
| @@ -377,8 +377,10 @@ void UserManagerImpl::EphemeralUserLoggedIn(const std::string& email) {
|
| void UserManagerImpl::InitializeWallpaper() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| if (!IsUserLoggedIn()) {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) {
|
| - if (!WizardController::IsDeviceRegistered()) {
|
| + 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.
|
| ash::Shell::GetInstance()->desktop_background_controller()->
|
|
|