| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 builder->Add("removeUserWarningTextCalculating", base::string16()); | 432 builder->Add("removeUserWarningTextCalculating", base::string16()); |
| 433 builder->Add("removeUserWarningTextSyncNoStats", base::string16()); | 433 builder->Add("removeUserWarningTextSyncNoStats", base::string16()); |
| 434 builder->Add("removeUserWarningTextSyncCalculating", base::string16()); | 434 builder->Add("removeUserWarningTextSyncCalculating", base::string16()); |
| 435 builder->AddF("removeLegacySupervisedUserWarningText", | 435 builder->AddF("removeLegacySupervisedUserWarningText", |
| 436 IDS_LOGIN_POD_LEGACY_SUPERVISED_USER_REMOVE_WARNING, | 436 IDS_LOGIN_POD_LEGACY_SUPERVISED_USER_REMOVE_WARNING, |
| 437 base::UTF8ToUTF16( | 437 base::UTF8ToUTF16( |
| 438 chrome::kLegacySupervisedUserManagementDisplayURL)); | 438 chrome::kLegacySupervisedUserManagementDisplayURL)); |
| 439 builder->Add("removeUserWarningButtonTitle", | 439 builder->Add("removeUserWarningButtonTitle", |
| 440 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON); | 440 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON); |
| 441 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE); | 441 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE); |
| 442 builder->Add("samlNoticeWithVideo", IDS_LOGIN_SAML_NOTICE_WITH_VIDEO); |
| 442 builder->AddF("confirmPasswordTitle", IDS_LOGIN_CONFIRM_PASSWORD_TITLE, | 443 builder->AddF("confirmPasswordTitle", IDS_LOGIN_CONFIRM_PASSWORD_TITLE, |
| 443 ash::GetChromeOSDeviceName()); | 444 ash::GetChromeOSDeviceName()); |
| 444 builder->Add("confirmPasswordLabel", IDS_LOGIN_CONFIRM_PASSWORD_LABEL); | 445 builder->Add("confirmPasswordLabel", IDS_LOGIN_CONFIRM_PASSWORD_LABEL); |
| 445 builder->Add("confirmPasswordIncorrectPassword", | 446 builder->Add("confirmPasswordIncorrectPassword", |
| 446 IDS_LOGIN_CONFIRM_PASSWORD_INCORRECT_PASSWORD); | 447 IDS_LOGIN_CONFIRM_PASSWORD_INCORRECT_PASSWORD); |
| 447 builder->Add("accountSetupCancelDialogTitle", | 448 builder->Add("accountSetupCancelDialogTitle", |
| 448 IDS_LOGIN_ACCOUNT_SETUP_CANCEL_DIALOG_TITLE); | 449 IDS_LOGIN_ACCOUNT_SETUP_CANCEL_DIALOG_TITLE); |
| 449 builder->Add("accountSetupCancelDialogNo", | 450 builder->Add("accountSetupCancelDialogNo", |
| 450 IDS_LOGIN_ACCOUNT_SETUP_CANCEL_DIALOG_NO); | 451 IDS_LOGIN_ACCOUNT_SETUP_CANCEL_DIALOG_NO); |
| 451 builder->Add("accountSetupCancelDialogYes", | 452 builder->Add("accountSetupCancelDialogYes", |
| (...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1434 } | 1435 } |
| 1435 | 1436 |
| 1436 void SigninScreenHandler::OnFeedbackFinished() { | 1437 void SigninScreenHandler::OnFeedbackFinished() { |
| 1437 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); | 1438 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); |
| 1438 | 1439 |
| 1439 // Recreate user's cryptohome after the feedkback is attempted. | 1440 // Recreate user's cryptohome after the feedkback is attempted. |
| 1440 HandleResyncUserData(); | 1441 HandleResyncUserData(); |
| 1441 } | 1442 } |
| 1442 | 1443 |
| 1443 } // namespace chromeos | 1444 } // namespace chromeos |
| OLD | NEW |