| Index: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| index ba1c5aa50cf4f8c55ebebd6e5408361a125f8e9e..55e69dd8c17f919c55b9857832c8b3b4443dd072 100644
|
| --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| @@ -52,10 +52,14 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
|
|
|
| // 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;
|
|
|