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

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

Issue 2516903002: PS - Adjusting Public Session login pod for expanded whitelisting (Closed)
Patch Set: Cache container div, this.parentNode Created 4 years 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/signin/user_manager_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 IDS_LOGIN_PASSWORD_CHANGED_PROCEED_ANYWAY); 448 IDS_LOGIN_PASSWORD_CHANGED_PROCEED_ANYWAY);
449 builder->Add("passwordChangedTryAgain", IDS_LOGIN_PASSWORD_CHANGED_TRY_AGAIN); 449 builder->Add("passwordChangedTryAgain", IDS_LOGIN_PASSWORD_CHANGED_TRY_AGAIN);
450 builder->Add("publicAccountInfoFormat", IDS_LOGIN_PUBLIC_ACCOUNT_INFO_FORMAT); 450 builder->Add("publicAccountInfoFormat", IDS_LOGIN_PUBLIC_ACCOUNT_INFO_FORMAT);
451 builder->Add("publicAccountReminder", 451 builder->Add("publicAccountReminder",
452 IDS_LOGIN_PUBLIC_ACCOUNT_SIGNOUT_REMINDER); 452 IDS_LOGIN_PUBLIC_ACCOUNT_SIGNOUT_REMINDER);
453 builder->Add("publicSessionLanguageAndInput", 453 builder->Add("publicSessionLanguageAndInput",
454 IDS_LOGIN_PUBLIC_SESSION_LANGUAGE_AND_INPUT); 454 IDS_LOGIN_PUBLIC_SESSION_LANGUAGE_AND_INPUT);
455 builder->Add("publicAccountEnter", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER); 455 builder->Add("publicAccountEnter", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER);
456 builder->Add("publicAccountEnterAccessibleName", 456 builder->Add("publicAccountEnterAccessibleName",
457 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME); 457 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME);
458 builder->Add("publicAccountMonitoringWarning",
459 IDS_LOGIN_PUBLIC_ACCOUNT_MONITORING_WARNING);
460 builder->Add("publicAccountLearnMore", IDS_LOGIN_PUBLIC_ACCOUNT_LEARN_MORE);
461 builder->Add("publicAccountMonitoringInfo",
462 IDS_LOGIN_PUBLIC_ACCOUNT_MONITORING_INFO);
463 builder->Add("publicAccountMonitoringInfoItem1",
464 IDS_LOGIN_PUBLIC_ACCOUNT_MONITORING_INFO_ITEM_1);
465 builder->Add("publicAccountMonitoringInfoItem2",
466 IDS_LOGIN_PUBLIC_ACCOUNT_MONITORING_INFO_ITEM_2);
467 builder->Add("publicAccountMonitoringInfoItem3",
468 IDS_LOGIN_PUBLIC_ACCOUNT_MONITORING_INFO_ITEM_3);
469 builder->Add("publicAccountMonitoringInfoItem4",
470 IDS_LOGIN_PUBLIC_ACCOUNT_MONITORING_INFO_ITEM_4);
458 builder->Add("publicSessionSelectLanguage", IDS_LANGUAGE_SELECTION_SELECT); 471 builder->Add("publicSessionSelectLanguage", IDS_LANGUAGE_SELECTION_SELECT);
459 builder->Add("publicSessionSelectKeyboard", IDS_KEYBOARD_SELECTION_SELECT); 472 builder->Add("publicSessionSelectKeyboard", IDS_KEYBOARD_SELECTION_SELECT);
460 builder->Add("removeUserWarningTextNonSyncNoStats", base::string16()); 473 builder->Add("removeUserWarningTextNonSyncNoStats", base::string16());
461 builder->Add("removeUserWarningTextNonSyncCalculating", base::string16()); 474 builder->Add("removeUserWarningTextNonSyncCalculating", base::string16());
462 builder->Add("removeUserWarningTextHistory", base::string16()); 475 builder->Add("removeUserWarningTextHistory", base::string16());
463 builder->Add("removeUserWarningTextPasswords", base::string16()); 476 builder->Add("removeUserWarningTextPasswords", base::string16());
464 builder->Add("removeUserWarningTextBookmarks", base::string16()); 477 builder->Add("removeUserWarningTextBookmarks", base::string16());
465 builder->Add("removeUserWarningTextSettings", base::string16()); 478 builder->Add("removeUserWarningTextSettings", base::string16());
466 builder->Add("removeUserWarningTextCalculating", base::string16()); 479 builder->Add("removeUserWarningTextCalculating", base::string16());
467 builder->Add("removeUserWarningTextSyncNoStats", base::string16()); 480 builder->Add("removeUserWarningTextSyncNoStats", base::string16());
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1520 } 1533 }
1521 1534
1522 void SigninScreenHandler::OnFeedbackFinished() { 1535 void SigninScreenHandler::OnFeedbackFinished() {
1523 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); 1536 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI");
1524 1537
1525 // Recreate user's cryptohome after the feedback is attempted. 1538 // Recreate user's cryptohome after the feedback is attempted.
1526 HandleResyncUserData(); 1539 HandleResyncUserData();
1527 } 1540 }
1528 1541
1529 } // namespace chromeos 1542 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | 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