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

chrome/browser/chromeos/login/webui_login_display_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
@@ skipping 191 matching lines @@
   BaseLoginDisplayHost::Observe(type, source, details);
   if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) {
     is_wallpaper_loaded_ = true;
     ash::Shell::GetInstance()->user_wallpaper_delegate()->
         OnWallpaperBootAnimationFinished();
     if (waiting_for_wallpaper_load_) {
       if (initialize_webui_in_parallel_)
         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,
                       content::NotificationService::AllSources());
   }
 }
 
 void WebUILoginDisplayHost::LoadURL(const GURL& url) {
   if (!login_window_) {
     views::Widget::InitParams params(
@@ skipping 90 matching lines @@
   login_view_->SetStatusAreaVisible(status_area_saved_visibility_);
   login_view_->OnPostponedShow();
 }
 
 void WebUILoginDisplayHost::StartPostponedWebUI() {
   if (!waiting_for_wallpaper_load_ || !is_wallpaper_loaded_) {
     NOTREACHED();
     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.
   if (restore_path_ == RESTORE_UNKNOWN) {
     NOTREACHED();
     return;
   }
 
   switch (restore_path_) {
     case RESTORE_WIZARD:
       StartWizard(wizard_first_screen_name_,
                   wizard_screen_parameters_.release());
       break;
     case RESTORE_SIGN_IN:
       StartSignInScreen();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos