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

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

Issue 1248613003: Issue 501916 : Add data type counts to profile deletion flow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sixth draft Created 5 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 <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 builder->Add("publicAccountInfoFormat", IDS_LOGIN_PUBLIC_ACCOUNT_INFO_FORMAT); 429 builder->Add("publicAccountInfoFormat", IDS_LOGIN_PUBLIC_ACCOUNT_INFO_FORMAT);
430 builder->Add("publicAccountReminder", 430 builder->Add("publicAccountReminder",
431 IDS_LOGIN_PUBLIC_ACCOUNT_SIGNOUT_REMINDER); 431 IDS_LOGIN_PUBLIC_ACCOUNT_SIGNOUT_REMINDER);
432 builder->Add("publicSessionLanguageAndInput", 432 builder->Add("publicSessionLanguageAndInput",
433 IDS_LOGIN_PUBLIC_SESSION_LANGUAGE_AND_INPUT); 433 IDS_LOGIN_PUBLIC_SESSION_LANGUAGE_AND_INPUT);
434 builder->Add("publicAccountEnter", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER); 434 builder->Add("publicAccountEnter", IDS_LOGIN_PUBLIC_ACCOUNT_ENTER);
435 builder->Add("publicAccountEnterAccessibleName", 435 builder->Add("publicAccountEnterAccessibleName",
436 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME); 436 IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME);
437 builder->Add("publicSessionSelectLanguage", IDS_LANGUAGE_SELECTION_SELECT); 437 builder->Add("publicSessionSelectLanguage", IDS_LANGUAGE_SELECTION_SELECT);
438 builder->Add("publicSessionSelectKeyboard", IDS_KEYBOARD_SELECTION_SELECT); 438 builder->Add("publicSessionSelectKeyboard", IDS_KEYBOARD_SELECTION_SELECT);
439 builder->Add("removeUserWarningText", 439 builder->Add("removeUserWarningTextNonSync", base::string16());
440 base::string16()); 440 builder->Add("removeUserWarningTextNonSyncNoStats", base::string16());
441 builder->Add("removeUserWarningTextHistory", base::string16());
442 builder->Add("removeUserWarningTextPasswords", base::string16());
443 builder->Add("removeUserWarningTextBookmarks", base::string16());
444 builder->Add("removeUserWarningTextSettings", base::string16());
445 builder->Add("removeUserWarningTextCalculating", base::string16());
446 builder->Add("removeUserWarningTextSync", base::string16());
447 builder->Add("removeUserWarningTextSyncNoStats", base::string16());
448 builder->Add("removeUserWarningManageLinkSync", base::string16());
441 builder->AddF("removeLegacySupervisedUserWarningText", 449 builder->AddF("removeLegacySupervisedUserWarningText",
442 IDS_LOGIN_POD_LEGACY_SUPERVISED_USER_REMOVE_WARNING, 450 IDS_LOGIN_POD_LEGACY_SUPERVISED_USER_REMOVE_WARNING,
443 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL)); 451 base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
444 builder->Add("removeUserWarningButtonTitle", 452 builder->Add("removeUserWarningButtonTitle",
445 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON); 453 IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON);
446 454
447 if (StartupUtils::IsWebviewSigninEnabled()) { 455 if (StartupUtils::IsWebviewSigninEnabled()) {
448 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE_NEW_GAIA_FLOW); 456 builder->Add("samlNotice", IDS_LOGIN_SAML_NOTICE_NEW_GAIA_FLOW);
449 builder->AddF("confirmPasswordTitle", 457 builder->AddF("confirmPasswordTitle",
450 IDS_LOGIN_CONFIRM_PASSWORD_TITLE_NEW_GAIA_FLOW, 458 IDS_LOGIN_CONFIRM_PASSWORD_TITLE_NEW_GAIA_FLOW,
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 return gaia_screen_handler_->frame_error(); 1457 return gaia_screen_handler_->frame_error();
1450 } 1458 }
1451 1459
1452 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1460 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1453 caps_lock_enabled_ = enabled; 1461 caps_lock_enabled_ = enabled;
1454 if (page_is_ready()) 1462 if (page_is_ready())
1455 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1463 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1456 } 1464 }
1457 1465
1458 } // namespace chromeos 1466 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698