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

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 34 matching lines @@
 
   virtual ~UserWallpaperDelegate() {
   }
 
   virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE {
     if (IsNormalWallpaperChange() || boot_animation_finished_)
       return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
 
     // It is a first boot case now. If kDisableBootAnimation flag
     // is passed, it only disables any transition after OOBE.
+    // |kDisableOobeAnimation| disables OOBE animation for slow hardware.
     bool is_registered = WizardController::IsDeviceRegistered();
-    bool disable_boot_animation = CommandLine::ForCurrentProcess()->
+    const CommandLine* command_line = CommandLine::ForCurrentProcess();
+    bool disable_boot_animation = command_line->
         HasSwitch(switches::kDisableBootAnimation);
-    if (is_registered && disable_boot_animation)
+    bool disable_oobe_animation = command_line->
+        HasSwitch(switches::kDisableOobeAnimation);
+    if (disable_oobe_animation || (is_registered && disable_boot_animation))
       return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
 
     return ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE;
   }
 
   virtual void InitializeWallpaper() OVERRIDE {
     chromeos::WallpaperManager::Get()->InitializeWallpaper();
   }
 
   virtual void OpenSetWallpaperPage() OVERRIDE {
@@ skipping 22 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
 };
 
 }  // namespace
 
 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
   return new chromeos::UserWallpaperDelegate();
 }
 
 }  // namespace chromeos