Chromium Code Reviews| Index: chrome/browser/chromeos/login/dom_login_display.h |
| diff --git a/chrome/browser/chromeos/login/dom_login_display.h b/chrome/browser/chromeos/login/dom_login_display.h |
| index 0f0afc50352406983a88ddcd499544f565809df9..f24132fe50cbc47a8aead48fc0aa0ccb86121487 100644 |
| --- a/chrome/browser/chromeos/login/dom_login_display.h |
| +++ b/chrome/browser/chromeos/login/dom_login_display.h |
| @@ -12,6 +12,7 @@ |
| #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 { |
| @@ -48,6 +49,10 @@ class DOMLoginDisplay : public LoginDisplay, |
| // 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 g
Nikita (slow)
2011/05/19 03:57:22
Ok, so my point was to rename it to just GetLoginW
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
rharrison
2011/05/19 00:31:43
Done.
|
| + |
| // LoginDisplay implementation: |
| virtual void Destroy() OVERRIDE; |
| virtual void Init(const std::vector<UserManager::User>& users, |
| @@ -76,7 +81,8 @@ class DOMLoginDisplay : public LoginDisplay, |
| 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
rharrison
2011/05/19 00:31:43
Did not know that, thanks for the catch.
|
| DISALLOW_COPY_AND_ASSIGN(DOMLoginDisplay); |
| }; |