Merge 152060 - Add --disable-oobe-animation flag to disable OOBE animation on slow hardware

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/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
@@ skipping 53 matching lines @@
       webui_login_display_(NULL),
       is_showing_login_(false),
       is_wallpaper_loaded_(false),
       initialize_webui_in_parallel_(kInitializeWebUIInParallelDefault),
       status_area_saved_visibility_(false),
       crash_count_(0),
       restore_path_(RESTORE_UNKNOWN) {
   bool is_registered = WizardController::IsDeviceRegistered();
   bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableOobeAnimation) &&
       !zero_delay_enabled) {
     bool disable_boot_animation = CommandLine::ForCurrentProcess()->
         HasSwitch(switches::kDisableBootAnimation);
     waiting_for_wallpaper_load_ = !is_registered || !disable_boot_animation;
   } else {
     waiting_for_wallpaper_load_ = false;
   }
 
   if (waiting_for_wallpaper_load_) {
     registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
@@ skipping 48 matching lines @@
 }
 
 void WebUILoginDisplayHost::SetOobeProgressBarVisible(bool visible) {
   GetOobeUI()->ShowOobeUI(visible);
 }
 
 void WebUILoginDisplayHost::SetShutdownButtonEnabled(bool enable) {
 }
 
 void WebUILoginDisplayHost::SetStatusAreaVisible(bool visible) {
-  if (waiting_for_wallpaper_load_  && initialize_webui_in_parallel_)
+  if (waiting_for_wallpaper_load_ && initialize_webui_in_parallel_)
     status_area_saved_visibility_ = visible;
   else if (login_view_)
     login_view_->SetStatusAreaVisible(visible);
 }
 
 void WebUILoginDisplayHost::StartWizard(const std::string& first_screen_name,
                                         DictionaryValue* screen_parameters) {
   // Keep parameters to restore if renderer crashes.
   restore_path_ = RESTORE_WIZARD;
   wizard_first_screen_name_ = first_screen_name;
@@ skipping 189 matching lines @@
     case RESTORE_SIGN_IN:
       StartSignInScreen();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos