Integrate WebUI Login with cros.

chrome/browser/chromeos/login/dom_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/dom_login_display.h"
 
-#include "chrome/browser/chromeos/frame/dom_browser.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"
 
 namespace {
 const char kLoginURL[] = "chrome://login";
 }  // namespace
 
 namespace chromeos {
 
 // DOMLoginDisplay, public: ---------------------------------------------------
 
 DOMLoginDisplay::~DOMLoginDisplay() {
-  if (login_screen_)
-    login_screen_->CloseWindow();
+  if (webui_login_window_.get())
+    webui_login_window_->Close();

[oshima, 2011/05/18 18:24:54]

if you want to keep scoped_ptr, you have to release it i think.

Or maybe simply call Destroy()?

[rharrison, 2011/05/19 00:31:43]

Removed the scoped ptr

 }
 
 // DOMLoginDisplay, Singleton implementation: ----------------------------------
 
 // static
 DOMLoginDisplay* DOMLoginDisplay::GetInstance() {
   return Singleton<DOMLoginDisplay>::get();
 }
 
 // LoginDisplay implementation: ------------------------------------------------
 
+// static
+views::Widget* DOMLoginDisplay::GetCurrentLoginWindow() {
+

[Ben Goodger (Google), 2011/05/18 16:50:51]

nit: delete the empty line

[rharrison, 2011/05/19 00:31:43]

Done.

+  return DOMLoginDisplay::GetInstance()->LoginWindow();
+}
+
 void DOMLoginDisplay::Destroy() {
   background_bounds_ = gfx::Rect();
   delegate_ = NULL;
+
+  webui_login_window_.reset(NULL);

[Ben Goodger (Google), 2011/05/18 16:50:51]

nit: reset() works

[oshima, 2011/05/18 18:24:54]

Don't you have to Close it?

[rharrison, 2011/05/19 00:31:43]

This correct, my mistake.

[rharrison, 2011/05/19 00:31:43]

I changed this to a normal pointer instead of a scoped_ptr

+  webui_login_view_ = NULL;
 }
 
 void DOMLoginDisplay::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;
 
   // TODO(rharrison): Add mechanism to pass in the show_guest and show_new_user
   // values.
-  login_screen_ = DOMBrowser::CreateForDOM(ProfileManager::GetDefaultProfile());
-  login_screen_->AddSelectedTabWithURL(GURL(kLoginURL),
-                                       PageTransition::START_PAGE);
-  login_screen_->window()->Show();
+  webui_login_window_.reset(
+      WebUILoginView::CreateWindowContainingView(background_bounds_,
+                                                 GURL(kLoginURL),
+                                                 &webui_login_view_));
+  webui_login_window_->Show();
 }
 
 void DOMLoginDisplay::OnBeforeUserRemoved(const std::string& username) {
   // TODO(rharrison): Figure out if I need to split anything between this and
   // OnUserRemoved
 }
 
 void DOMLoginDisplay::OnUserImageChanged(UserManager::User* user) {
   // TODO(rharrison): Update the user in the user vector
   // TODO(rharrison): Push the change to DOM Login screen
@@ skipping 35 matching lines @@
   delegate_->LoginAsGuest();
 }
 
 // DOMLoginDisplay, private: ---------------------------------------------------
 
 // Singleton implementation: ---------------------------------------------------
 
 DOMLoginDisplay::DOMLoginDisplay()
     : LoginDisplay(NULL, gfx::Rect()),
       LoginUIHandlerDelegate(),
-      login_screen_(NULL) {}
+      webui_login_window_(NULL) {
+
+}
+
 
 }  // namespace chromeos