[cros] Flip enable-new-oobe switch.

chrome/browser/chromeos/login/webui_login_display_host.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/login/webui_login_display_host.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
       login_window_(NULL),
       login_view_(NULL),
       webui_login_display_(NULL),
       is_showing_login_(false),
       is_wallpaper_loaded_(false),
       crash_count_(0),
       restore_path_(RESTORE_UNKNOWN) {
   bool is_registered = WizardController::IsDeviceRegistered();
   // TODO(nkostylev): Add switch to disable wallpaper transition on OOBE.
   // Should be used on test images so that they are not slowed down.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe))
+  bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) &&
+      !zero_delay_enabled) {
     waiting_for_wallpaper_load_ = !is_registered;
-  else
+  } else {
     waiting_for_wallpaper_load_ = false;
+  }
 
   if (waiting_for_wallpaper_load_) {
     registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
                    content::NotificationService::AllSources());
     // Prevents white flashing on OOBE (http://crbug.com/131569).
     aura::Env::GetInstance()->set_render_white_bg(false);
   }
 }
 
 WebUILoginDisplayHost::~WebUILoginDisplayHost() {
@@ skipping 102 matching lines @@
                       content::NotificationService::AllSources());
   }
 }
 
 void WebUILoginDisplayHost::LoadURL(const GURL& url) {
   if (!login_window_) {
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.bounds = background_bounds();
     params.show_state = ui::SHOW_STATE_FULLSCREEN;
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe))
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe))
       params.transparent = true;
     params.parent =
         ash::Shell::GetContainer(
             ash::Shell::GetPrimaryRootWindow(),
             ash::internal::kShellWindowId_LockScreenContainer);
 
     login_window_ = new views::Widget;
     login_window_->Init(params);
     login_view_ = new WebUILoginView();
 
@@ skipping 83 matching lines @@
     case RESTORE_SIGN_IN:
       StartSignInScreen();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos