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

chrome/browser/chromeos/login/webui_login_display.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.h"
 
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #endif
 
 namespace chromeos {
 
 // WebUILoginDisplay, public: --------------------------------------------------
 
 WebUILoginDisplay::~WebUILoginDisplay() {
 }
 
-// WebUILoginDisplay, Singleton implementation: --------------------------------
-
-// static
-WebUILoginDisplay* WebUILoginDisplay::GetInstance() {
-  return Singleton<WebUILoginDisplay>::get();
-}
-
 // LoginDisplay implementation: ------------------------------------------------
 
-// static
-views::Widget* WebUILoginDisplay::GetLoginWindow() {
-  return WebUILoginDisplay::GetInstance()->LoginWindow();
-}
-
-views::Widget* WebUILoginDisplay::LoginWindow() {
-  return login_window_;
-}
-
-void WebUILoginDisplay::Destroy() {
-  background_bounds_ = gfx::Rect();
-  delegate_ = NULL;
+WebUILoginDisplay::WebUILoginDisplay(LoginDisplay::Delegate* delegate)
+    : LoginDisplay(delegate, gfx::Rect()),
+      show_guest_(false),
+      show_new_user_(false),
+      webui_handler_(NULL) {
 }
 
 void WebUILoginDisplay::Init(const std::vector<UserManager::User>& users,
                              bool show_guest,
                              bool show_new_user) {
   // Testing that the delegate has been set.
   DCHECK(delegate_);
 
   users_ = users;
   show_guest_ = show_guest;
@@ skipping 138 matching lines @@
   webui_handler_ = webui_handler;
 }
 
 void WebUILoginDisplay::ShowSigninScreenForCreds(
     const std::string& username,
     const std::string& password) {
   DCHECK(webui_handler_);
   webui_handler_->ShowSigninScreenForCreds(username, password);
 }
 
-// WebUILoginDisplay, private: -------------------------------------------------
 
-// Singleton implementation: ---------------------------------------------------
+const std::vector<UserManager::User>& WebUILoginDisplay::GetUsers() const {
+  return users_;
+}
 
-WebUILoginDisplay::WebUILoginDisplay()
-    : LoginDisplay(NULL, gfx::Rect()),
-      show_guest_(false),
-      show_new_user_(false),
-      login_window_(NULL),
-      webui_handler_(NULL) {
+bool WebUILoginDisplay::IsShowGuest() const {
+  return show_guest_;
+}
+
+bool WebUILoginDisplay::IsShowNewUser() const {
+  return show_new_user_;
 }
 
 }  // namespace chromeos