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

chrome/browser/chromeos/login/views_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/views_login_display_host.h"
 
 #include "chrome/browser/chromeos/login/views_login_display.h"
+#include "chrome/browser/chromeos/login/views_oobe_display.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
+#include "chrome/browser/chromeos/login/wizard_controller.h"
+
 
 namespace chromeos {
 
 // ViewsLoginDisplayHost -------------------------------------------------------
 
 ViewsLoginDisplayHost::ViewsLoginDisplayHost(const gfx::Rect& background_bounds)
     : BaseLoginDisplayHost(background_bounds),
       background_view_(NULL),
       background_window_(NULL) {
 }
 
 ViewsLoginDisplayHost::~ViewsLoginDisplayHost() {
   if (background_window_)
     background_window_->Close();
 }
 
 // LoginDisplayHost implementation -----------------------------------------
 
 LoginDisplay* ViewsLoginDisplayHost::CreateLoginDisplay(
-    LoginDisplay::Delegate* delegate) const {
+    LoginDisplay::Delegate* delegate) {
   chromeos::WizardAccessibilityHelper::GetInstance()->Init();
   return new ViewsLoginDisplay(delegate, background_bounds());
 }
 
 gfx::NativeWindow ViewsLoginDisplayHost::GetNativeWindow() const {
   if (background_view_)
     return background_view_->GetNativeWindow();
   else
     return NULL;
 }
@@ skipping 28 matching lines @@
     background_window_->Show();
     return;
   }
   background_window_ =
       BackgroundView::CreateWindowContainingView(background_bounds(),
                                                  GURL(),
                                                  &background_view_);
   background_window_->Show();
 }
 
+void ViewsLoginDisplayHost::StartSignInScreen() {
+  oobe_display_.reset();
+  BaseLoginDisplayHost::StartSignInScreen();
+}
+
+WizardController* ViewsLoginDisplayHost::CreateWizardController() {
+  oobe_display_.reset(new ViewsOobeDisplay(background_bounds()));
+  WizardController* wizard_controller  =
+      new WizardController(this, oobe_display_.get());
+  oobe_display_->SetScreenObserver(wizard_controller);
+  return wizard_controller;
+}
+
 }  // namespace chromeos