[cros,de-hack] Get rid of singleton for the WebUILoginScreen.

chrome/browser/chromeos/login/webui_login_display_host.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "chrome/browser/chromeos/login/oobe_display.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
@@ skipping 16 matching lines @@
 // URL which corresponds to the OOBE WebUI.
 const char kOobeURL[] = "chrome://oobe";
 
 }  // namespace
 
 // WebUILoginDisplayHost -------------------------------------------------------
 
 WebUILoginDisplayHost::WebUILoginDisplayHost(const gfx::Rect& background_bounds)
     : BaseLoginDisplayHost(background_bounds),
       login_window_(NULL),
-      login_view_(NULL) {
+      login_view_(NULL),
+      webui_login_display_(NULL) {
 }
 
 WebUILoginDisplayHost::~WebUILoginDisplayHost() {
   if (login_window_)
     login_window_->Close();
 }
 
 // LoginDisplayHost implementation ---------------------------------------------
 
 LoginDisplay* WebUILoginDisplayHost::CreateLoginDisplay(
-    LoginDisplay::Delegate* delegate) const {
-  WebUILoginDisplay* webui_login_display = WebUILoginDisplay::GetInstance();
-  webui_login_display->set_delegate(delegate);
-  webui_login_display->set_background_bounds(background_bounds());
-  return webui_login_display;
+    LoginDisplay::Delegate* delegate) {
+  webui_login_display_ = new WebUILoginDisplay(delegate);
+  webui_login_display_->set_background_bounds(background_bounds());
+  return webui_login_display_;
 }
 
 gfx::NativeWindow WebUILoginDisplayHost::GetNativeWindow() const {
   return login_window_ ? login_window_->GetNativeWindow() : NULL;
 }
 
 void WebUILoginDisplayHost::SetOobeProgress(BackgroundView::LoginStep step) {
 }
 
 void WebUILoginDisplayHost::SetOobeProgressBarVisible(bool visible) {
@@ skipping 43 matching lines @@
     LoadURL(GURL(kOobeURL));
 
   BaseLoginDisplayHost::StartWizard(first_screen_name, start_url);
 }
 
 void WebUILoginDisplayHost::StartSignInScreen() {
   if (!login_window_)
     LoadURL(GURL(kLoginURL));
 
   BaseLoginDisplayHost::StartSignInScreen();
-  GetOobeUI()->ShowSigninScreen();
+  GetOobeUI()->ShowSigninScreen(webui_login_display_);
 }
 
 void WebUILoginDisplayHost::LoadURL(const GURL& url) {
   if (!login_window_) {
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.bounds = background_bounds();
 
     login_window_ = new views::Widget;
     login_window_->Init(params);
     login_view_ = new WebUILoginView();
 
-    login_view_->Init();
+    login_view_->Init(login_window_);
 
 #if defined(USE_AURA)
     aura_shell::Shell::GetInstance()->GetContainer(
         aura_shell::internal::kShellWindowId_LockScreenContainer)->
         AddChild(login_window_->GetNativeView());
 #endif
 
     login_window_->SetContentsView(login_view_);
     login_view_->UpdateWindowType();
 
     login_window_->Show();
 #if defined(USE_AURA)
     login_window_->GetNativeView()->set_name("WebUILoginView");
 #endif
-    WebUILoginDisplay::GetInstance()->set_login_window(login_window_);
     login_view_->OnWindowCreated();
   }
   login_view_->LoadURL(url);
 }
 
 OobeUI* WebUILoginDisplayHost::GetOobeUI() const {
   return static_cast<OobeUI*>(login_view_->GetWebUI());
 }
 
 WizardController* WebUILoginDisplayHost::CreateWizardController() {
   // TODO(altimofeev): ensure that WebUI is ready.
   OobeDisplay* oobe_display = GetOobeUI();
   return new WizardController(this, oobe_display);
 }
 
 }  // namespace chromeos