Integrate WebUI Login with cros.

chrome/browser/chromeos/login/dom_login_display.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_DOM_LOGIN_DISPLAY_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_DOM_LOGIN_DISPLAY_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/singleton.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/login_ui.h"
 
 namespace gfx {
 class Rect;
 }  // namespace gfx
 
 namespace chromeos {
 
 class DOMBrowser;
 
@@ skipping 16 matching lines @@
 //   set_login_handler(this);
 
 class DOMLoginDisplay : public LoginDisplay,
                         public LoginUIHandlerDelegate {
  public:
   virtual ~DOMLoginDisplay();
 
   // Singleton implementation:
   static DOMLoginDisplay* GetInstance();
 
+  static views::Widget* GetCurrentLoginWindow();

[Nikita (slow), 2011/05/18 20:22:12]

Are we planning to have multiple windows?

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

No, this is a convenience method, so that we can get the Widget associated with
the login screen for plumbing the extension events. I preferred to not have that
code need to know that this class is a Singleton, since that may change in the
future.

[Nikita (slow), 2011/05/19 03:57:22]

Ok, so my point was to rename it to just GetLoginWindow() then.

[rharrison, 2011/05/19 16:45:28]

Done.

+
+  views::Widget* LoginWindow()  { return webui_login_window_.get(); }

[Nikita (slow), 2011/05/18 20:22:12]

Please move implementation to cc file. It's not a simple getter.

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

Done.

+
   // LoginDisplay implementation:
   virtual void Destroy() OVERRIDE;
   virtual void Init(const std::vector<UserManager::User>& users,
                     bool show_guest,
                     bool show_new_user) OVERRIDE;
   virtual void OnBeforeUserRemoved(const std::string& username) OVERRIDE;
   virtual void OnUserImageChanged(UserManager::User* user) OVERRIDE;
   virtual void OnUserRemoved(const std::string& username) OVERRIDE;
   virtual void OnFadeOut() OVERRIDE;
   virtual void SetUIEnabled(bool is_enabled) OVERRIDE;
   virtual void ShowError(int error_msg_id,
                          int login_attempts,
                          HelpAppLauncher::HelpTopic help_topic_id) OVERRIDE;
 
   // LoginUIHandlerDelegate
   virtual void Login(const std::string& username,
                      const std::string& password) OVERRIDE;
   virtual void LoginAsGuest() OVERRIDE;
 
  private:
   // Singleton implementation:
   friend struct DefaultSingletonTraits<DOMLoginDisplay>;
   DOMLoginDisplay();
 
   // Set of Users in the systemvisible UserControllers.
   std::vector<UserManager::User> users_;
 
   // Container of the screen we are displaying
-  DOMBrowser* login_screen_;
+  WebUILoginView* webui_login_view_;
+  scoped_ptr<views::Widget> webui_login_window_;

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

widget manages its memory by itself, so you don't need scoped_ptr here.

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

Did not know that, thanks for the catch.

 
   DISALLOW_COPY_AND_ASSIGN(DOMLoginDisplay);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_DOM_LOGIN_DISPLAY_H_