Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Unified Diff: chrome/browser/chromeos/login/base_login_display_host.cc

Issue 9107068: Don't animate the default/background layer if there is no background. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698