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

Side by Side Diff: ui/login/account_picker/screen_account_picker.js

Issue 2027683003: Pin keyboard moved to under the user profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fixed patch set 6 errors. Created 4 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 /** 5 /**
6 * @fileoverview Account picker screen implementation. 6 * @fileoverview Account picker screen implementation.
7 */ 7 */
8 8
9 login.createScreen('AccountPickerScreen', 'account-picker', function() { 9 login.createScreen('AccountPickerScreen', 'account-picker', function() {
10 /** 10 /**
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 }, 197 },
198 198
199 /** 199 /**
200 * Loads the PIN keyboard if any of the users can login with a PIN. 200 * Loads the PIN keyboard if any of the users can login with a PIN.
201 * @param {array} users Array of user instances. 201 * @param {array} users Array of user instances.
202 */ 202 */
203 loadPinKeyboardIfNeeded_: function(users) { 203 loadPinKeyboardIfNeeded_: function(users) {
204 for (var i = 0; i < users.length; ++i) { 204 for (var i = 0; i < users.length; ++i) {
205 var user = users[i]; 205 var user = users[i];
206 if (user.showPin) { 206 if (user.showPin) {
207 showPinKeyboardAsync(); 207 loadPinKeyboardAsync();
208 return; 208 return;
209 } 209 }
210 } 210 }
211 }, 211 },
212 212
213 /** 213 /**
214 * Loads given users in pod row. 214 * Loads given users in pod row.
215 * @param {array} users Array of user. 215 * @param {array} users Array of user.
216 * @param {boolean} showGuest Whether to show guest session button. 216 * @param {boolean} showGuest Whether to show guest session button.
217 */ 217 */
218 loadUsers: function(users, showGuest) { 218 loadUsers: function(users, showGuest) {
219 this.loadPinKeyboardIfNeeded_(users);
220
221 $('pod-row').loadPods(users);
222 $('login-header-bar').showGuestButton = showGuest; 219 $('login-header-bar').showGuestButton = showGuest;
223 // On Desktop, #login-header-bar has a shadow if there are 8+ profiles. 220 // On Desktop, #login-header-bar has a shadow if there are 8+ profiles.
224 if (Oobe.getInstance().displayType == DISPLAY_TYPE.DESKTOP_USER_MANAGER) 221 if (Oobe.getInstance().displayType == DISPLAY_TYPE.DESKTOP_USER_MANAGER)
225 $('login-header-bar').classList.toggle('shadow', users.length > 8); 222 $('login-header-bar').classList.toggle('shadow', users.length > 8);
223
224 this.loadPinKeyboardIfNeeded_(users);
225 $('pod-row').loadPods(users);
jdufault 2016/06/23 00:02:31 Why was this moved?
sammiequon 2016/06/23 19:23:21 Done.
226 }, 226 },
227 227
228 /** 228 /**
229 * Runs app with a given id from the list of loaded apps. 229 * Runs app with a given id from the list of loaded apps.
230 * @param {!string} app_id of an app to run. 230 * @param {!string} app_id of an app to run.
231 * @param {boolean=} opt_diagnostic_mode Whether to run the app in 231 * @param {boolean=} opt_diagnostic_mode Whether to run the app in
232 * diagnostic mode. Default is false. 232 * diagnostic mode. Default is false.
233 */ 233 */
234 runAppForTesting: function(app_id, opt_diagnostic_mode) { 234 runAppForTesting: function(app_id, opt_diagnostic_mode) {
235 $('pod-row').findAndRunAppForTesting(app_id, opt_diagnostic_mode); 235 $('pod-row').findAndRunAppForTesting(app_id, opt_diagnostic_mode);
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 * @param {string} userID The user ID of the public session 403 * @param {string} userID The user ID of the public session
404 * @param {string} locale The locale to which this list of keyboard layouts 404 * @param {string} locale The locale to which this list of keyboard layouts
405 * applies 405 * applies
406 * @param {!Object} list List of available keyboard layouts 406 * @param {!Object} list List of available keyboard layouts
407 */ 407 */
408 setPublicSessionKeyboardLayouts: function(userID, locale, list) { 408 setPublicSessionKeyboardLayouts: function(userID, locale, list) {
409 $('pod-row').setPublicSessionKeyboardLayouts(userID, locale, list); 409 $('pod-row').setPublicSessionKeyboardLayouts(userID, locale, list);
410 } 410 }
411 }; 411 };
412 }); 412 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698