Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2174)

Unified Diff: chrome/browser/chromeos/login/dom_login_display.h

Issue 6973029: Integrate WebUI Login with cros. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed ResetXCursor and did_paint_and fixed segfault in WebUILoginView Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..613a47e8cba921ed0e6ca6e622a33aa16c755e12 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,12 @@ class DOMLoginDisplay : public LoginDisplay,
// Singleton implementation:
static DOMLoginDisplay* GetInstance();
+ // Wrapper used to help in routing keyboard key presses into the login
+ // screen. This gets the Login Window widget from the Singleton, so that other
+ // classes don't need to know we are a Singleton
+ static views::Widget* GetLoginWindow();
+ views::Widget* LoginWindow();
+
// LoginDisplay implementation:
virtual void Destroy() OVERRIDE;
virtual void Init(const std::vector<UserManager::User>& users,
@@ -76,7 +83,8 @@ class DOMLoginDisplay : public LoginDisplay,
std::vector<UserManager::User> users_;
// Container of the screen we are displaying
- DOMBrowser* login_screen_;
+ WebUILoginView* webui_login_view_; // Owned by webui_login_window_
+ views::Widget* webui_login_window_;
DISALLOW_COPY_AND_ASSIGN(DOMLoginDisplay);
};

Powered by Google App Engine
This is Rietveld 408576698