Index: chrome/browser/chromeos/login/base_login_display_host.cc |
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc |
index 9e44d640999582798342cdcdb0273b4fd98fb46f..a551cedbccde0e996cc2007f65942566bcbaab6f 100644 |
--- a/chrome/browser/chromeos/login/base_login_display_host.cc |
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc |
@@ -328,6 +328,14 @@ void BaseLoginDisplayHost::StartAnimation() { |
base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs)); |
layer->SetOpacity(0.0f); |
+ if (ash::Shell::GetInstance()->GetContainer( |
+ ash::internal::kShellWindowId_DesktopBackgroundContainer)-> |
+ children().empty()) { |
+ // If there is no background window, don't perform any animation on the |
+ // default and background layer because there is nothing behind it. |
+ return; |
+ } |
+ |
// Background animation. |
if (kEnableBackgroundAnimation) { |
ui::Transform background_transform; |