| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 builder->Add("publicAccountEnterAccessibleName", | 371 builder->Add("publicAccountEnterAccessibleName", |
| 372 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME); | 372 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME); |
| 373 builder->AddF("removeUserWarningText", | 373 builder->AddF("removeUserWarningText", |
| 374 IDS_LOGIN_POD_USER_REMOVE_WARNING, | 374 IDS_LOGIN_POD_USER_REMOVE_WARNING, |
| 375 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); | 375 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); |
| 376 builder->Add("removeUserWarningButtonTitle", | 376 builder->Add("removeUserWarningButtonTitle", |
| 377 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON); | 377 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON); |
| 378 | 378 |
| 379 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE); | 379 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE); |
| 380 | 380 |
| 381 // Strings used by confirm password dialog. | |
| 382 builder->Add("confirmPasswordTitle", IDS_LOGIN_CONFIRM_PASSWORD_TITLE); | 381 builder->Add("confirmPasswordTitle", IDS_LOGIN_CONFIRM_PASSWORD_TITLE); |
| 383 builder->Add("confirmPasswordHint", IDS_LOGIN_CONFIRM_PASSWORD_HINT); | 382 builder->Add("confirmPasswordLabel", IDS_LOGIN_CONFIRM_PASSWORD_LABEL); |
| 384 builder->Add("confirmPasswordConfirmButton", | 383 builder->Add("confirmPasswordConfirmButton", |
| 385 IDS_LOGIN_CONFIRM_PASSWORD_CONFIRM_BUTTON); | 384 IDS_LOGIN_CONFIRM_PASSWORD_CONFIRM_BUTTON); |
| 385 builder->Add("confirmPasswordText", IDS_LOGIN_CONFIRM_PASSWORD_TEXT); |
| 386 builder->Add("confirmPasswordErrorText", |
| 387 IDS_LOGIN_CONFIRM_PASSWORD_ERROR_TEXT); |
| 386 | 388 |
| 387 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) | 389 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) |
| 388 builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE); | 390 builder->Add("demoLoginMessage", IDS_KIOSK_MODE_LOGIN_MESSAGE); |
| 389 } | 391 } |
| 390 | 392 |
| 391 void SigninScreenHandler::Show(const LoginScreenContext& context) { | 393 void SigninScreenHandler::Show(const LoginScreenContext& context) { |
| 392 CHECK(delegate_); | 394 CHECK(delegate_); |
| 393 | 395 |
| 394 // Just initialize internal fields from context and call ShowImpl(). | 396 // Just initialize internal fields from context and call ShowImpl(). |
| 395 oobe_ui_ = context.oobe_ui(); | 397 oobe_ui_ = context.oobe_ui(); |
| (...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1654 DCHECK(gaia_screen_handler_); | 1656 DCHECK(gaia_screen_handler_); |
| 1655 return gaia_screen_handler_->frame_state(); | 1657 return gaia_screen_handler_->frame_state(); |
| 1656 } | 1658 } |
| 1657 | 1659 |
| 1658 net::Error SigninScreenHandler::FrameError() const { | 1660 net::Error SigninScreenHandler::FrameError() const { |
| 1659 DCHECK(gaia_screen_handler_); | 1661 DCHECK(gaia_screen_handler_); |
| 1660 return gaia_screen_handler_->frame_error(); | 1662 return gaia_screen_handler_->frame_error(); |
| 1661 } | 1663 } |
| 1662 | 1664 |
| 1663 } // namespace chromeos | 1665 } // namespace chromeos |
| OLD | NEW |