Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 2189163002: Add remove non-device-owner user removal confirmation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 builder->Add("removeUserWarningTextPasswords", base::string16()); 455 builder->Add("removeUserWarningTextPasswords", base::string16());
456 builder->Add("removeUserWarningTextBookmarks", base::string16()); 456 builder->Add("removeUserWarningTextBookmarks", base::string16());
457 builder->Add("removeUserWarningTextSettings", base::string16()); 457 builder->Add("removeUserWarningTextSettings", base::string16());
458 builder->Add("removeUserWarningTextCalculating", base::string16()); 458 builder->Add("removeUserWarningTextCalculating", base::string16());
459 builder->Add("removeUserWarningTextSyncNoStats", base::string16()); 459 builder->Add("removeUserWarningTextSyncNoStats", base::string16());
460 builder->Add("removeUserWarningTextSyncCalculating", base::string16()); 460 builder->Add("removeUserWarningTextSyncCalculating", base::string16());
461 builder->AddF("removeLegacySupervisedUserWarningText", 461 builder->AddF("removeLegacySupervisedUserWarningText",
462 IDS_LOGIN_POD_LEGACY_SUPERVISED_USER_REMOVE_WARNING, 462 IDS_LOGIN_POD_LEGACY_SUPERVISED_USER_REMOVE_WARNING,
463 base::UTF8ToUTF16( 463 base::UTF8ToUTF16(
464 chrome::kLegacySupervisedUserManagementDisplayURL)); 464 chrome::kLegacySupervisedUserManagementDisplayURL));
465 builder->Add("removeNonOwnerUserWarningText",
466 IDS_LOGIN_POD_NON_OWNER_USER_REMOVE_WARNING);
465 builder->Add("removeUserWarningButtonTitle", 467 builder->Add("removeUserWarningButtonTitle",
466 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON); 468 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON);
467 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE); 469 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE);
468 builder->Add("samlNoticeWithVideo", IDS_LOGIN_SAML_NOTICE_WITH_VIDEO); 470 builder->Add("samlNoticeWithVideo", IDS_LOGIN_SAML_NOTICE_WITH_VIDEO);
469 builder->AddF("confirmPasswordTitle", IDS_LOGIN_CONFIRM_PASSWORD_TITLE, 471 builder->AddF("confirmPasswordTitle", IDS_LOGIN_CONFIRM_PASSWORD_TITLE,
470 ash::GetChromeOSDeviceName()); 472 ash::GetChromeOSDeviceName());
471 builder->Add("confirmPasswordLabel", IDS_LOGIN_CONFIRM_PASSWORD_LABEL); 473 builder->Add("confirmPasswordLabel", IDS_LOGIN_CONFIRM_PASSWORD_LABEL);
472 builder->Add("confirmPasswordIncorrectPassword", 474 builder->Add("confirmPasswordIncorrectPassword",
473 IDS_LOGIN_CONFIRM_PASSWORD_INCORRECT_PASSWORD); 475 IDS_LOGIN_CONFIRM_PASSWORD_INCORRECT_PASSWORD);
474 builder->Add("accountSetupCancelDialogTitle", 476 builder->Add("accountSetupCancelDialogTitle",
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 } 1494 }
1493 1495
1494 void SigninScreenHandler::OnFeedbackFinished() { 1496 void SigninScreenHandler::OnFeedbackFinished() {
1495 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); 1497 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI");
1496 1498
1497 // Recreate user's cryptohome after the feedback is attempted. 1499 // Recreate user's cryptohome after the feedback is attempted.
1498 HandleResyncUserData(); 1500 HandleResyncUserData();
1499 } 1501 }
1500 1502
1501 } // namespace chromeos 1503 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/webui/signin/user_manager_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698