diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 20:05:56 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 20:05:56 +0000 |
| commit | f262a9e3cf6726c8f01c06300b4d1555c5afcec8 (patch) | |
| tree | 3c3368fa7a0818894eab0da41802a958af3b4aa3 /ash/wm/root_window_layout_manager.cc | |
| parent | a88f87ece75b6b4888aee98693186f900e006130 (diff) | |
| download | chromium_src-f262a9e3cf6726c8f01c06300b4d1555c5afcec8.zip chromium_src-f262a9e3cf6726c8f01c06300b4d1555c5afcec8.tar.gz chromium_src-f262a9e3cf6726c8f01c06300b4d1555c5afcec8.tar.bz2 | |
Reland "Fix white flash when user signs out and fix wallpaper animation regression"
This CL reland CL http://codereview.chromium.org/10827284/. Previous CL was failed on some
interactive ui tests.
" When user signs out and transit to the login screen, the wallpaper fade in from a white screen.
Described in 141563, this Cl fixed it.
Also, after user login, or switch users at login screen. when wallpaper change, the new wallpaper
should fade in nicely. There is a regression in recent builds. This fix fixed the regression as well. "
BUG=141563, 141676, 142042
TBR=nkostylev, sky
Review URL: https://chromiumcodereview.appspot.com/10834308
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/root_window_layout_manager.cc')
| -rw-r--r-- | ash/wm/root_window_layout_manager.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc index 2b5df2f..99a9774 100644 --- a/ash/wm/root_window_layout_manager.cc +++ b/ash/wm/root_window_layout_manager.cc @@ -39,8 +39,11 @@ void RootWindowLayoutManager::OnWindowResized() { for (j = (*i)->children().begin(); j != (*i)->children().end(); ++j) (*j)->SetBounds(fullscreen_bounds); } - internal::DesktopBackgroundWidgetController* background = - owner_->GetProperty(internal::kWindowDesktopComponent); + internal::DesktopBackgroundWidgetController* background = NULL; + internal::ComponentWrapper* wrapper = + owner_->GetProperty(internal::kComponentWrapper); + if (wrapper) + background = wrapper->component(); if (background) background->SetBounds(fullscreen_bounds); } |