| Index: chrome/browser/chromeos/login/ui/webui_login_display.h
|
| diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| index 87c9120c59edde1583b8ce50df26a40e76b2cf7e..9eccc7c444069bb52169e2b35907ca67699905da 100644
|
| --- a/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| +++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
|
| @@ -10,6 +10,8 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/timer/timer.h"
|
| +#include "chrome/browser/chromeos/login/screens/gaia_screen.h"
|
| +#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
|
| #include "chrome/browser/chromeos/login/ui/login_display.h"
|
| #include "chrome/browser/chromeos/login/users/user.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
|
| @@ -37,10 +39,7 @@ class WebUILoginDisplay : public LoginDisplay,
|
| virtual void OnBeforeUserRemoved(const std::string& username) OVERRIDE;
|
| virtual void OnUserImageChanged(const User& user) OVERRIDE;
|
| virtual void OnUserRemoved(const std::string& username) OVERRIDE;
|
| - virtual void OnFadeOut() OVERRIDE;
|
| - virtual void OnLoginSuccess(const std::string& username) OVERRIDE;
|
| virtual void SetUIEnabled(bool is_enabled) OVERRIDE;
|
| - virtual void SelectPod(int index) OVERRIDE;
|
| virtual void ShowBannerMessage(const std::string& message) OVERRIDE;
|
| virtual void ShowUserPodButton(const std::string& username,
|
| const std::string& iconURL,
|
| @@ -103,9 +102,6 @@ class WebUILoginDisplay : public LoginDisplay,
|
| void StartPasswordClearTimer();
|
| void OnPasswordClearTimerExpired();
|
|
|
| - // Set of Users that are visible.
|
| - UserList users_;
|
| -
|
| // Whether to show guest login.
|
| bool show_guest_;
|
|
|
| @@ -122,6 +118,9 @@ class WebUILoginDisplay : public LoginDisplay,
|
| // Reference to the WebUI handling layer for the login screen
|
| LoginDisplayWebUIHandler* webui_handler_;
|
|
|
| + scoped_ptr<GaiaScreen> gaia_screen_;
|
| + scoped_ptr<UserSelectionScreen> user_selection_screen_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay);
|
| };
|
|
|
|
|