Chromium Code Reviews| 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..ca985044f435f76aedfd9d3261387d66d3f892b8 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; |
| @@ -365,7 +373,8 @@ void BaseLoginDisplayHost::StartAnimation() { |
| // Browser windows layer opacity animation. |
| if (kEnableBrowserWindowsOpacityAnimation) { |
| - scoped_ptr<ui::LayerAnimationElement> browser_opacity_animation_initial( |
| + scoped_ptr<ui::LayerAnimationElement> br |
|
Nikita (slow)
2012/01/13 10:16:30
Please fix.
oshima
2012/01/13 18:35:57
oops. done.
|
| +owser_opacity_animation_initial( |
| ui::LayerAnimationElement::CreateOpacityElement( |
| 0.0f, |
| base::TimeDelta())); |