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

chrome/browser/chromeos/setting_level_bubble.cc

Index: chrome/browser/chromeos/setting_level_bubble.cc
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc
index c546f88455987beeed36cab168edef82d1719c95..d109ce6e75d0e9372cab407227cb420156d9d5ce 100644
--- a/chrome/browser/chromeos/setting_level_bubble.cc
+++ b/chrome/browser/chromeos/setting_level_bubble.cc
@@ -7,7 +7,9 @@
 #include <algorithm>
 
 #include "chrome/browser/chromeos/login/background_view.h"
+#include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/setting_level_bubble_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -73,15 +75,23 @@ static views::Widget* GetToplevelWidget() {
 #else
     // Otherwise, see if there's a background window that we can use.
     BackgroundView* background = LoginUtils::Get()->GetBackgroundView();
-    if (background)
+    if (background) {
       window = GTK_WINDOW(background->GetNativeWindow());
+    } else {
+      ExistingUserController* controller =
+          ExistingUserController::current_controller();
+      if (controller) {
+        window =
+            GTK_WINDOW(controller->login_display_host()->GetNativeWindow());
+      }
+    }
 #endif
   }
 
   if (window)
     return views::Widget::GetWidgetForNativeWindow(window);
   else
-    return WebUILoginDisplay::GetLoginWindow();
+    return NULL;

[Nikita (slow), 2011/10/31 11:14:18]

NOTREACHED() ?

[altimofeev, 2011/10/31 16:55:52]

Done.

 }
 
 SettingLevelBubble::SettingLevelBubble(SkBitmap* increase_icon,