| Index: trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.cc (revision 275547)
|
| +++ trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.cc (working copy)
|
| @@ -247,13 +247,30 @@
|
| delegate_->CompleteLogin(user_context);
|
| }
|
|
|
| -void WebUILoginDisplay::Login(const UserContext& user_context,
|
| - const SigninSpecifics& specifics) {
|
| +void WebUILoginDisplay::Login(const UserContext& user_context) {
|
| DCHECK(delegate_);
|
| if (delegate_)
|
| - delegate_->Login(user_context, specifics);
|
| + 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);
|
| +}
|
| +
|
| void WebUILoginDisplay::MigrateUserData(const std::string& old_password) {
|
| DCHECK(delegate_);
|
| if (delegate_)
|
| @@ -342,6 +359,11 @@
|
| 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();
|
|
|