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

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

Issue 1191273002: ChromeOS: Show the new POD RE-AUTH ICON when users needs to re-auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years, 5 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 ::login::LocalizedValuesBuilder* builder) { 352 ::login::LocalizedValuesBuilder* builder) {
353 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT); 353 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT);
354 builder->Add("signingIn", IDS_LOGIN_POD_SIGNING_IN); 354 builder->Add("signingIn", IDS_LOGIN_POD_SIGNING_IN);
355 builder->Add("podMenuButtonAccessibleName", 355 builder->Add("podMenuButtonAccessibleName",
356 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); 356 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME);
357 builder->Add("podMenuRemoveItemAccessibleName", 357 builder->Add("podMenuRemoveItemAccessibleName",
358 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); 358 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME);
359 builder->Add("passwordFieldAccessibleName", 359 builder->Add("passwordFieldAccessibleName",
360 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); 360 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME);
361 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); 361 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER);
362 builder->Add("signinButton", IDS_LOGIN_BUTTON);
363 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON); 362 builder->Add("launchAppButton", IDS_LAUNCH_APP_BUTTON);
364 builder->Add("restart", IDS_RESTART_BUTTON); 363 builder->Add("restart", IDS_RESTART_BUTTON);
365 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON); 364 builder->Add("shutDown", IDS_SHUTDOWN_BUTTON);
366 builder->Add("addUser", IDS_ADD_USER_BUTTON); 365 builder->Add("addUser", IDS_ADD_USER_BUTTON);
367 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON); 366 builder->Add("browseAsGuest", IDS_GO_INCOGNITO_BUTTON);
368 builder->Add("moreOptions", IDS_MORE_OPTIONS_BUTTON); 367 builder->Add("moreOptions", IDS_MORE_OPTIONS_BUTTON);
369 builder->Add("addSupervisedUser", IDS_CREATE_SUPERVISED_USER_MENU_LABEL); 368 builder->Add("addSupervisedUser", IDS_CREATE_SUPERVISED_USER_MENU_LABEL);
370 builder->Add("cancel", IDS_CANCEL); 369 builder->Add("cancel", IDS_CANCEL);
371 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT); 370 builder->Add("signOutUser", IDS_SCREEN_LOCK_SIGN_OUT);
372 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML); 371 builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML);
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 return gaia_screen_handler_->frame_error(); 1444 return gaia_screen_handler_->frame_error();
1446 } 1445 }
1447 1446
1448 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1447 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1449 caps_lock_enabled_ = enabled; 1448 caps_lock_enabled_ = enabled;
1450 if (page_is_ready()) 1449 if (page_is_ready())
1451 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1450 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1452 } 1451 }
1453 1452
1454 } // namespace chromeos 1453 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen.css ('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