[cros] Flip enable-new-oobe switch.

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"
@@ skipping 16 matching lines @@
 
 class UserWallpaperDelegate: public ash::UserWallpaperDelegate {
  public:
   UserWallpaperDelegate() {
   }
 
   virtual ~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.
     if (is_registered)
       return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
     else
       return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE;
   }
 
   virtual void InitializeWallpaper() OVERRIDE {
@@ skipping 19 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
 };
 
 }  // namespace
 
 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
   return new chromeos::UserWallpaperDelegate();
 }
 
 }  // namespace chromeos