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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
@@ skipping 197 matching lines @@
 void NetworkStateInformer::SendStateToObservers(const std::string& reason) {
   for (base::hash_set<std::string>::iterator it = observers_.begin();
        it != observers_.end(); ++it) {
     SendState(*it, reason);
   }
 }
 
 // SigninScreenHandler implementation ------------------------------------------
 
 SigninScreenHandler::SigninScreenHandler()
-    : delegate_(WebUILoginDisplay::GetInstance()),
+    : delegate_(NULL),
       show_on_init_(false),
       oobe_ui_(false),
       dns_cleared_(false),
       dns_clear_task_running_(false),
       cookies_cleared_(false),
       extension_driven_(
           CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kWebUILogin)),
       cookie_remover_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       key_event_listener_(NULL) {
-  delegate_->SetWebUIHandler(this);
 }
 
 SigninScreenHandler::~SigninScreenHandler() {
   weak_factory_.InvalidateWeakPtrs();
   if (cookie_remover_)
     cookie_remover_->RemoveObserver(this);
   if (key_event_listener_)
     key_event_listener_->RemoveCapsLockObserver(this);
 }
 
@@ skipping 60 matching lines @@
     // figure out how to make it fast enough.
     SendUserList(false);
 
     // Reset Caps Lock state when login screen is shown.
     input_method::XKeyboard::SetCapsLockEnabled(false);
 
     ShowScreen(kAccountPickerScreen, NULL);
   }
 }
 
+void SigninScreenHandler::SetDelegate(SigninScreenHandlerDelegate* delegate) {
+  delegate_ = delegate;
+  DCHECK(delegate_);
+  delegate_->SetWebUIHandler(this);
+}
+
 // SigninScreenHandler, private: -----------------------------------------------
 
 void SigninScreenHandler::Initialize() {
   // Register for Caps Lock state change notifications;
   key_event_listener_ = SystemKeyEventListener::GetInstance();
   if (key_event_listener_)
     key_event_listener_->AddCapsLockObserver(this);
 
   if (show_on_init_) {
     show_on_init_ = false;
@@ skipping 218 matching lines @@
 }
 
 void SigninScreenHandler::HandleLaunchHelpApp(const base::ListValue* args) {
   double help_topic_id;  // Javascript number is passed back as double.
   if (!args->GetDouble(0, &help_topic_id)) {
     NOTREACHED();
     return;
   }
 
   if (!help_app_.get())
-    help_app_ = new HelpAppLauncher(
-        WebUILoginDisplay::GetLoginWindow()->GetNativeWindow());
+    help_app_ = new HelpAppLauncher(GetNativeWindow());
   help_app_->ShowHelpTopic(
       static_cast<HelpAppLauncher::HelpTopic>(help_topic_id));
 }
 
 void SigninScreenHandler::SendUserList(bool animated) {
-  bool show_guest = WebUILoginDisplay::GetInstance()->show_guest();
+  bool show_guest = delegate_->IsShowGuest();
 
   size_t max_non_owner_users = show_guest ? kMaxUsers - 2 : kMaxUsers - 1;
   size_t non_owner_count = 0;
 
   ListValue users_list;
-  UserVector users = WebUILoginDisplay::GetInstance()->users();
+  UserVector users = delegate_->GetUsers();
 
   bool single_user = users.size() == 1;
   for (UserVector::const_iterator it = users.begin();
        it != users.end(); ++it) {
     const std::string& email = it->email();
     bool is_owner = email == UserCrosSettingsProvider::cached_owner();
 
     if (non_owner_count < max_non_owner_users || is_owner) {
       DictionaryValue* user_dict = new DictionaryValue();
       user_dict->SetString(kKeyName, it->GetDisplayName());
@@ skipping 111 matching lines @@
 
   cookie_remover_ = new BrowsingDataRemover(
       Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
       BrowsingDataRemover::EVERYTHING,
       base::Time());
   cookie_remover_->AddObserver(this);
   cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA);
 }
 
 }  // namespace chromeos