| Index: chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| index d227fcdcad011b54f1db7a4866b3387af3bd66ef..173abaa62e0a874718a699d1e53c91f41bea9151 100644
|
| --- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| +++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| @@ -247,28 +247,11 @@ void WebUILoginDisplay::CompleteLogin(const UserContext& user_context) {
|
| delegate_->CompleteLogin(user_context);
|
| }
|
|
|
| -void WebUILoginDisplay::Login(const UserContext& user_context) {
|
| +void WebUILoginDisplay::Login(const UserContext& user_context,
|
| + const SigninSpecifics& specifics) {
|
| DCHECK(delegate_);
|
| if (delegate_)
|
| - delegate_->Login(user_context);
|
| -}
|
| -
|
| -void WebUILoginDisplay::LoginAsRetailModeUser() {
|
| - DCHECK(delegate_);
|
| - if (delegate_)
|
| - delegate_->LoginAsRetailModeUser();
|
| -}
|
| -
|
| -void WebUILoginDisplay::LoginAsGuest() {
|
| - DCHECK(delegate_);
|
| - if (delegate_)
|
| - delegate_->LoginAsGuest();
|
| -}
|
| -
|
| -void WebUILoginDisplay::LoginAsPublicAccount(const std::string& username) {
|
| - DCHECK(delegate_);
|
| - if (delegate_)
|
| - delegate_->LoginAsPublicAccount(username);
|
| + delegate_->Login(user_context, specifics);
|
| }
|
|
|
| void WebUILoginDisplay::MigrateUserData(const std::string& old_password) {
|
| @@ -359,11 +342,6 @@ void WebUILoginDisplay::Signout() {
|
| delegate_->Signout();
|
| }
|
|
|
| -void WebUILoginDisplay::LoginAsKioskApp(const std::string& app_id,
|
| - bool diagnostic_mode) {
|
| - delegate_->LoginAsKioskApp(app_id, diagnostic_mode);
|
| -}
|
| -
|
| void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
|
| if (delegate_)
|
| delegate_->ResetPublicSessionAutoLoginTimer();
|
|
|