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

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

Issue 10824253: Set flag for wallpaper wait correctly now that we have parallel/postpone init types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/webui_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc
index f244ac1b5f7ee202eb3f3d1ad1487a1953cade75..cef2871547ceae8ec0fa1750a6d509403d658380 100644
--- a/chrome/browser/chromeos/login/webui_login_display_host.cc
+++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
@@ -209,6 +209,10 @@ void WebUILoginDisplayHost::Observe(
ShowWebUI();
else
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,
chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
@@ -319,10 +323,6 @@ void WebUILoginDisplayHost::StartPostponedWebUI() {
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
// been called. In general this should not happen.
// Let go through normal code path when one of those will be called.
« 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