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

chrome/browser/chromeos/login/webui_login_view.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_view.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 95 matching lines @@
 namespace chromeos {
 
 // static
 const int WebUILoginView::kStatusAreaCornerPadding = 5;
 
 // WebUILoginView public: ------------------------------------------------------
 
 WebUILoginView::WebUILoginView()
     : status_area_(NULL),
       webui_login_(NULL),
+      login_window_(NULL),
       status_window_(NULL),
       host_window_frozen_(false),
       status_area_visibility_on_init_(true) {
 #if defined(USE_VIRTUAL_KEYBOARD)
   // Make sure the singleton VirtualKeyboardManager object is created.
   VirtualKeyboardManager::GetInstance();
 #endif
   accel_map_[views::Accelerator(ui::VKEY_Z, false, true, true)] =
       kAccelNameAccessibility;
   accel_map_[views::Accelerator(ui::VKEY_ESCAPE, false, false, false)] =
       kAccelNameCancel;
   accel_map_[views::Accelerator(ui::VKEY_E, false, true, true)] =
       kAccelNameEnrollment;
 
   for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
     AddAccelerator(i->first);
 }
 
 WebUILoginView::~WebUILoginView() {
   if (status_window_)
     status_window_->CloseNow();
   status_window_ = NULL;
 }
 
-void WebUILoginView::Init() {
-
+void WebUILoginView::Init(views::Widget* login_window) {
+  login_window_ = login_window;
   webui_login_ = new DOMView();
   AddChildView(webui_login_);
   webui_login_->Init(ProfileManager::GetDefaultProfile(), NULL);
   webui_login_->SetVisible(true);
 
   TabContents* tab_contents = webui_login_->dom_contents()->tab_contents();
   tab_contents->set_delegate(this);
 
   tab_watcher_.reset(new TabFirstRenderWatcher(tab_contents, this));
 }
@@ skipping 178 matching lines @@
   oobe_ui->OnLoginPromptVisible();
 }
 
 void WebUILoginView::InitStatusArea() {
   DCHECK(status_area_ == NULL);
   DCHECK(status_window_ == NULL);
   status_area_ = new StatusAreaView(this);
   status_area_->Init();
   status_area_->SetVisible(status_area_visibility_on_init_);
 
-  views::Widget* login_window = GetLoginWindow();
   // Width of |status_window| is meant to be large enough.
   // The current value of status_area_->GetPreferredSize().width()
   // will be too small when button status is changed.
   // (e.g. when CapsLock indicator appears)
   gfx::Size widget_size(width()/2,
                         status_area_->GetPreferredSize().height());
   const int widget_x = base::i18n::IsRTL() ?
       kStatusAreaCornerPadding :
       width() - widget_size.width() - kStatusAreaCornerPadding;
   gfx::Rect widget_bounds(widget_x, kStatusAreaCornerPadding,
                           widget_size.width(), widget_size.height());
 #if defined(TOUCH_UI)
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_CONTROL);
 #else
   // TODO(nkostylev|oshima): Make status area in the same window as
   // |webui_login_| once RenderWidgetHostViewViews and compositor are
   // ready.
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
 #endif
   widget_params.bounds = widget_bounds;
   widget_params.transparent = true;
-  widget_params.parent_widget = login_window;
+  widget_params.parent_widget = login_window_;
   status_window_ = new views::Widget;
   status_window_->Init(widget_params);
 
 #if defined(TOOLKIT_USES_GTK)
   chromeos::WmIpc::instance()->SetWindowType(
       status_window_->GetNativeView(),
       chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
       NULL);
 #endif
 
@@ skipping 40 matching lines @@
   unhandled_keyboard_event_handler_.HandleKeyboardEvent(event,
                                                         GetFocusManager());
 
   // Make sure error bubble is cleared on keyboard event. This is needed
   // when the focus is inside an iframe.
   WebUI* web_ui = GetWebUI();
   if (web_ui)
     web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
 }
 
-views::Widget* WebUILoginView::GetLoginWindow() {
-  return WebUILoginDisplay::GetLoginWindow();
-}
-
 }  // namespace chromeos