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

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

Issue 2222583002: Lock screen pin keyboard ui upgrades. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Pin warnings moved inside pin keyboard. 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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 builder->Add("pinKeyboard" + base::IntToString(j), 371 builder->Add("pinKeyboard" + base::IntToString(j),
372 base::FormatNumber(int64_t{j})); 372 base::FormatNumber(int64_t{j}));
373 } 373 }
374 374
375 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT); 375 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT);
376 builder->Add("pinKeyboardPlaceholderPin", 376 builder->Add("pinKeyboardPlaceholderPin",
377 IDS_PIN_KEYBOARD_HINT_TEXT_PIN); 377 IDS_PIN_KEYBOARD_HINT_TEXT_PIN);
378 builder->Add("pinKeyboardPlaceholderPinPassword", 378 builder->Add("pinKeyboardPlaceholderPinPassword",
379 IDS_PIN_KEYBOARD_HINT_TEXT_PIN_PASSWORD); 379 IDS_PIN_KEYBOARD_HINT_TEXT_PIN_PASSWORD);
380 builder->Add("pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR); 380 builder->Add("pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR);
381 builder->Add("pinKeyboardErrorMessage", IDS_PIN_KEYBOARD_ERROR_MESSAGE);
jdufault 2016/08/22 20:56:40 Move string to oobe strings, rename it so it is sp
sammiequon 2016/08/23 17:30:18 I removed this because this is not used anymore.
381 builder->Add("signingIn", IDS_LOGIN_POD_SIGNING_IN); 382 builder->Add("signingIn", IDS_LOGIN_POD_SIGNING_IN);
382 builder->Add("podMenuButtonAccessibleName", 383 builder->Add("podMenuButtonAccessibleName",
383 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); 384 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME);
384 builder->Add("podMenuRemoveItemAccessibleName", 385 builder->Add("podMenuRemoveItemAccessibleName",
385 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); 386 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME);
386 builder->Add("passwordFieldAccessibleName", 387 builder->Add("passwordFieldAccessibleName",
387 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); 388 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME);
388 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); 389 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER);
389 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON); 390 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON);
390 builder->Add("restart", IDS_RESTART_BUTTON); 391 builder->Add("restart", IDS_RESTART_BUTTON);
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 } 1495 }
1495 1496
1496 void SigninScreenHandler::OnFeedbackFinished() { 1497 void SigninScreenHandler::OnFeedbackFinished() {
1497 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); 1498 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI");
1498 1499
1499 // Recreate user's cryptohome after the feedback is attempted. 1500 // Recreate user's cryptohome after the feedback is attempted.
1500 HandleResyncUserData(); 1501 HandleResyncUserData();
1501 } 1502 }
1502 1503
1503 } // namespace chromeos 1504 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698