| Index: chrome/browser/chromeos/login/webui_login_display_host.cc
|
| diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc
|
| index 6930d97678e9682d87daee2f99528346e2ac9fe4..7cebc60114d2d8779dc7aaf9b069886e248bf622 100644
|
| --- a/chrome/browser/chromeos/login/webui_login_display_host.cc
|
| +++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
|
| @@ -71,6 +71,8 @@ WebUILoginDisplayHost::WebUILoginDisplayHost(const gfx::Rect& background_bounds)
|
| 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);
|
| @@ -139,7 +141,7 @@ 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);
|
|
|