Fix OOBE WebUI being never started.

TBR=ivankr@chromium.org
BUG=141986

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151139 0039d316-1c4b-4281-b951-d872f2087c98
parent 93df81ea
...@@ -208,14 +208,14 @@ void WebUILoginDisplayHost::Observe( ...@@ -208,14 +208,14 @@ void WebUILoginDisplayHost::Observe(
ash::Shell::GetInstance()->user_wallpaper_delegate()-> ash::Shell::GetInstance()->user_wallpaper_delegate()->
OnWallpaperBootAnimationFinished(); OnWallpaperBootAnimationFinished();
if (waiting_for_wallpaper_load_) { if (waiting_for_wallpaper_load_) {
if (initialize_webui_in_parallel_)
ShowWebUI();
else
StartPostponedWebUI();
// StartWizard / StartSignInScreen could be called multiple times through // StartWizard / StartSignInScreen could be called multiple times through
// the lifetime of host. // the lifetime of host.
// Make sure that subsequent calls are not postponed. // Make sure that subsequent calls are not postponed.
waiting_for_wallpaper_load_ = false; waiting_for_wallpaper_load_ = false;
if (initialize_webui_in_parallel_)
ShowWebUI();
else
StartPostponedWebUI();
} }
registrar_.Remove(this, registrar_.Remove(this,
chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
...@@ -321,7 +321,7 @@ void WebUILoginDisplayHost::ShowWebUI() { ...@@ -321,7 +321,7 @@ void WebUILoginDisplayHost::ShowWebUI() {
} }
void WebUILoginDisplayHost::StartPostponedWebUI() { void WebUILoginDisplayHost::StartPostponedWebUI() {
if (!waiting_for_wallpaper_load_ || !is_wallpaper_loaded_) { if (!is_wallpaper_loaded_) {
NOTREACHED(); NOTREACHED();
return; return;
} }
......
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