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

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

Issue 8395042: [cros,de-hack] Get rid of singleton for the WebUILoginScreen. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: clang fix Created 9 years, 2 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/webui_login_view.h
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index 1836328400778411c0158739cb362db5506c7b1d..3dd3fa1a48ffa3ed31a7a58f5b7ad7accee2fcea 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -43,7 +43,7 @@ class WebUILoginView : public views::WidgetDelegateView,
virtual ~WebUILoginView();
// Initializes the webui login view.
- virtual void Init();
+ virtual void Init(views::Widget* login_window);
// Overridden from views::Views:
virtual bool AcceleratorPressed(
@@ -99,9 +99,6 @@ class WebUILoginView : public views::WidgetDelegateView,
// Creates and adds the status area (separate window).
virtual void InitStatusArea();
- // Get the views widget hosting this WebUILoginView.
- virtual views::Widget* GetLoginWindow();
-
StatusAreaView* status_area_;
// DOMView for rendering a webpage as a webui login.
@@ -122,6 +119,9 @@ class WebUILoginView : public views::WidgetDelegateView,
// |reverse| is true when focus is traversed backwards (using Shift-Tab).
void ReturnFocus(bool reverse);
+ // Login window which shows the view.
+ views::Widget* login_window_;
+
// Window that contains status area.
// TODO(nkostylev): Temporary solution till we have
// RenderWidgetHostViewViews working.

Powered by Google App Engine
This is Rietveld 408576698