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

chrome/browser/chromeos/setting_level_bubble.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/setting_level_bubble.h"
 
 #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"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/bubble/bubble.h"
 #include "ui/gfx/screen.h"
 #include "views/widget/root_view.h"
 
@@ skipping 45 matching lines @@
           ProfileManager::GetDefaultProfile(),
           true);  // match_incognito
   if (browser) {
     window = browser->window()->GetNativeHandle();
   } else {
 #if defined(USE_AURA)
     // TODO(saintlou): Unsure what to do for the Aura background.
 #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,
                                        SkBitmap* decrease_icon,
                                        SkBitmap* disabled_icon)
     : current_percent_(-1.0),
       target_percent_(-1.0),
       increase_icon_(increase_icon),
       decrease_icon_(decrease_icon),
       disabled_icon_(disabled_icon),
@@ skipping 151 matching lines @@
 
   last_target_update_time_ = now;
 }
 
 void SettingLevelBubble::StopAnimation() {
   animation_timer_.Stop();
   is_animating_ = false;
 }
 
 }  // namespace chromeos