Ties up OOBE controllers and WebUI handlers.

chrome/browser/chromeos/login/webui_login_display.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_display.h"
 
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "views/widget/widget.h"
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/chromeos/login/touch_login_view.h"
 #endif
 
-namespace {
-const char kLoginURL[] = "chrome://login";
-}  // namespace
-
 namespace chromeos {
 
 // WebUILoginDisplay, public: --------------------------------------------------
 
 WebUILoginDisplay::~WebUILoginDisplay() {
-  if (login_window_)
-    login_window_->Close();
 }
 
 // WebUILoginDisplay, Singleton implementation: --------------------------------
 
 // static
 WebUILoginDisplay* WebUILoginDisplay::GetInstance() {
   return Singleton<WebUILoginDisplay>::get();
 }
 
 // LoginDisplay implementation: ------------------------------------------------
 
 // static
 views::Widget* WebUILoginDisplay::GetLoginWindow() {
   return WebUILoginDisplay::GetInstance()->LoginWindow();
 }
 
 views::Widget* WebUILoginDisplay::LoginWindow() {
   return login_window_;
 }
 
 void WebUILoginDisplay::Destroy() {
   background_bounds_ = gfx::Rect();
   delegate_ = NULL;
-
-  if (login_window_)
-    login_window_->Close();
-
-  login_window_ = NULL;
 }
 
   // TODO(rharrison): Add mechanism to pass in the show_guest and show_new_user
   // values.
 void WebUILoginDisplay::Init(const std::vector<UserManager::User>& users,
                              bool show_guest,
                              bool show_new_user) {
   // Testing that the delegate has been set.
   DCHECK(delegate_);
+
   users_ = users;
-
-  views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
-  params.bounds = background_bounds_;
-
-  login_window_ = new views::Widget;
-  login_window_->Init(params);
-
-#if defined(TOUCH_UI)
-  TouchLoginView* login_view = new TouchLoginView();
-#else
-  WebUILoginView* login_view = new WebUILoginView();
-#endif
-  login_view->Init(GURL(kLoginURL));
-  login_window_->SetContentsView(login_view);
-  login_view->UpdateWindowType();
-
-  login_window_->Show();
 }
 
 void WebUILoginDisplay::OnBeforeUserRemoved(const std::string& username) {
   // TODO(rharrison): Figure out if I need to split anything between this and
   // OnUserRemoved
 }
 
 void WebUILoginDisplay::OnUserImageChanged(UserManager::User* user) {
   // TODO(rharrison): Update the user in the user vector
   // TODO(rharrison): Push the change to WebUI Login screen
@@ skipping 43 matching lines @@
 
 // Singleton implementation: ---------------------------------------------------
 
 WebUILoginDisplay::WebUILoginDisplay()
     : LoginDisplay(NULL, gfx::Rect()),
       LoginUIHandlerDelegate(),
       login_window_(NULL) {
 }
 
 }  // namespace chromeos