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

chrome/browser/chromeos/login/webui_login_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
 #pragma once
 
 #include "chrome/browser/chromeos/login/login_html_dialog.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
@@ skipping 25 matching lines @@
                        public TabContentsDelegate,
                        public chromeos::LoginHtmlDialog::Delegate,
                        public TabFirstRenderWatcher::Delegate {
  public:
   static const int kStatusAreaCornerPadding;
 
   WebUILoginView();
   virtual ~WebUILoginView();
 
   // Initializes the webui login view.
-  virtual void Init();
+  virtual void Init(views::Widget* login_window);
 
   // Overridden from views::Views:
   virtual bool AcceleratorPressed(
       const views::Accelerator& accelerator) OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
 
   // Overridden from StatusAreaHost:
   virtual gfx::NativeWindow GetNativeWindow() const;
 
   // Called when WebUI window is created.
@@ skipping 35 matching lines @@
   virtual void OnLocaleChanged() OVERRIDE;
 
   // TabFirstRenderWatcher::Delegate implementation.
   virtual void OnRenderHostCreated(RenderViewHost* host) OVERRIDE;
   virtual void OnTabMainFrameLoaded() OVERRIDE;
   virtual void OnTabMainFrameFirstRender() OVERRIDE;
 
   // Creates and adds the status area (separate window).
   virtual void InitStatusArea();
 
-  // Get the views widget hosting this WebUILoginView.
-  virtual views::Widget* GetLoginWindow();
-
   StatusAreaView* status_area_;
 
   // DOMView for rendering a webpage as a webui login.
   DOMView* webui_login_;
 
  private:
   // Map type for the accelerator-to-identifier map.
   typedef std::map<views::Accelerator, std::string> AccelMap;
 
   // Overridden from TabContentsDelegate.
   virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
   virtual void HandleKeyboardEvent(
       const NativeWebKeyboardEvent& event) OVERRIDE;
   virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
   virtual bool TakeFocus(bool reverse) OVERRIDE;
 
   // Called when focus is returned from status area.
   // |reverse| is true when focus is traversed backwards (using Shift-Tab).
   void ReturnFocus(bool reverse);
 
+  // Login window which shows the view.
+  views::Widget* login_window_;
+
   // Window that contains status area.
   // TODO(nkostylev): Temporary solution till we have
   // RenderWidgetHostViewViews working.
   views::Widget* status_window_;
 
   // Converts keyboard events on the TabContents to accelerators.
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   // Maps installed accelerators to OOBE webui accelerator identifiers.
   AccelMap accel_map_;
 
   // Proxy settings dialog that can be invoked from network menu.
   scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
 
   // Watches webui_login_'s TabContents rendering.
   scoped_ptr<TabFirstRenderWatcher> tab_watcher_;
 
   // Whether the host window is frozen.
   bool host_window_frozen_;
 
   // Caches StatusArea visibility setting before it has been initialized.
   bool status_area_visibility_on_init_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUILoginView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_