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

chrome/browser/chromeos/login/screen_locker_webui.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/screen_locker_webui.h"
 
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
@@ skipping 119 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(InputEventObserver);
 };
 
 // ScreenLockWebUI creates components necessary to authenticate a user to
 // unlock the screen.
 class ScreenLockWebUI : public WebUILoginView {
  public:
   explicit ScreenLockWebUI(ScreenLocker* screen_locker);
   virtual ~ScreenLockWebUI();
 
-  // WebUILoginView overrides:
-  virtual void Init() OVERRIDE;
+  // Initializes ScreenLockWebUI.
+  void InitView();
 
   // Clears and sets the focus to the password field.
   void ClearAndSetFocusToPassword();
 
   // Enable/Disable signout button.
   void SetSignoutEnabled(bool enabled);
 
   // Display error message.
   void DisplayErrorMessage(string16 message);
 
   void SubmitPassword();
 
   // Overridden from views::Views:
   virtual bool AcceleratorPressed(
       const views::Accelerator& accelerator) OVERRIDE;
   virtual void HandleKeyboardEvent(
       const NativeWebKeyboardEvent& event) OVERRIDE;
 
- protected:
-  // WebUILoginView overrides:
-  virtual views::Widget* GetLoginWindow() OVERRIDE;
-
  private:
   friend class test::ScreenLockerTester;
 
   // ScreenLocker is owned by itself.
   ScreenLocker* screen_locker_;
 
   std::string password_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenLockWebUI);
 };
@@ skipping 23 matching lines @@
   lock_window_->Init(params);
   gtk_widget_modify_bg(
       lock_window_->GetNativeView(), GTK_STATE_NORMAL, &kGdkBlack);
 
   g_signal_connect(lock_window_->GetNativeView(), "client-event",
                    G_CALLBACK(OnClientEventThunk), this);
 
   // GTK does not like zero width/height.
   if (!unlock_on_input) {
     screen_lock_webui_ = new ScreenLockWebUI(screen_locker_);
-    screen_lock_webui_->Init();
+    screen_lock_webui_->InitView();
     screen_lock_webui_->SetEnabled(false);
   } else {
     input_event_observer_.reset(new InputEventObserver(screen_locker_));
     MessageLoopForUI::current()->AddObserver(input_event_observer_.get());
   }
 
   DCHECK(GTK_WIDGET_REALIZED(lock_window_->GetNativeView()));
   WmIpc::instance()->SetWindowType(
       lock_window_->GetNativeView(),
       WM_IPC_WINDOW_CHROME_SCREEN_LOCKER,
@@ skipping 74 matching lines @@
 // ScreenLockWebUI implementation.
 
 ScreenLockWebUI::ScreenLockWebUI(ScreenLocker* screen_locker)
     : screen_locker_(screen_locker) {
   DCHECK(screen_locker_);
 }
 
 ScreenLockWebUI::~ScreenLockWebUI() {
 }
 
-void ScreenLockWebUI::Init() {
-  WebUILoginView::Init();
+void ScreenLockWebUI::InitView() {
+  DCHECK(screen_locker_webui_);
+  Init(screen_locker_webui_->lock_window_);
   LoadURL(GURL(chrome::kChromeUILockScreenURL));
 }
 
 void ScreenLockWebUI::ClearAndSetFocusToPassword() {
   // TODO(flackr): Send a javascript message to clear and focus the password
   // field.
   NOTIMPLEMENTED();
 }
 
 void ScreenLockWebUI::SetSignoutEnabled(bool enabled) {
@@ skipping 24 matching lines @@
 }
 
 void ScreenLockWebUI::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   // Override WebUILoginView::HandleKeyboardEvent to prevent call to WebUI
   // cr.ui.Oobe functions.
   // TODO(flackr): This might be able to be removed once merging with the login
   //     screen WebUI is complete.
 }
 
-views::Widget* ScreenLockWebUI::GetLoginWindow() {
-  DCHECK(screen_locker_webui_);
-  return screen_locker_webui_->lock_window_;
-}
-
 }  // namespace chromeos