Set flag for wallpaper wait correctly now that we have parallel/postpone init types

BUG=141751

Review URL: https://chromiumcodereview.appspot.com/10824253

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151034 0039d316-1c4b-4281-b951-d872f2087c98
parent 3e3459e0
...@@ -209,6 +209,10 @@ void WebUILoginDisplayHost::Observe( ...@@ -209,6 +209,10 @@ void WebUILoginDisplayHost::Observe(
ShowWebUI(); ShowWebUI();
else else
StartPostponedWebUI(); StartPostponedWebUI();
// StartWizard / StartSignInScreen could be called multiple times through
// the lifetime of host.
// Make sure that subsequent calls are not postponed.
waiting_for_wallpaper_load_ = false;
} }
registrar_.Remove(this, registrar_.Remove(this,
chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
...@@ -319,10 +323,6 @@ void WebUILoginDisplayHost::StartPostponedWebUI() { ...@@ -319,10 +323,6 @@ void WebUILoginDisplayHost::StartPostponedWebUI() {
return; return;
} }
// StartWizard / StartSignInScreen could be called multiple times through
// the lifetime of host. Make sure that subsequent calls are not postponed.
waiting_for_wallpaper_load_ = false;
// Wallpaper has finished loading before StartWizard/StartSignInScreen has // Wallpaper has finished loading before StartWizard/StartSignInScreen has
// been called. In general this should not happen. // been called. In general this should not happen.
// Let go through normal code path when one of those will be called. // Let go through normal code path when one of those will be called.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment