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

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

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 * @param {HTMLElement} content Content to show in bubble. 143 * @param {HTMLElement} content Content to show in bubble.
144 */ 144 */
145 showErrorBubble: function(loginAttempts, error) { 145 showErrorBubble: function(loginAttempts, error) {
146 var activatedPod = $('pod-row').activatedPod; 146 var activatedPod = $('pod-row').activatedPod;
147 if (!activatedPod) { 147 if (!activatedPod) {
148 $('bubble').showContentForElement($('pod-row'), 148 $('bubble').showContentForElement($('pod-row'),
149 cr.ui.Bubble.Attachment.RIGHT, 149 cr.ui.Bubble.Attachment.RIGHT,
150 error); 150 error);
151 return; 151 return;
152 } 152 }
153 // Show web authentication if this is not a locally managed user. 153 // Show web authentication if this is not a supervised user.
154 if (loginAttempts > MAX_LOGIN_ATTEMPTS_IN_POD && 154 if (loginAttempts > MAX_LOGIN_ATTEMPTS_IN_POD &&
155 !activatedPod.user.locallyManagedUser) { 155 !activatedPod.user.supervisedUser) {
156 activatedPod.showSigninUI(); 156 activatedPod.showSigninUI();
157 } else { 157 } else {
158 // We want bubble's arrow to point to the first letter of input. 158 // We want bubble's arrow to point to the first letter of input.
159 /** @const */ var BUBBLE_OFFSET = 7; 159 /** @const */ var BUBBLE_OFFSET = 7;
160 /** @const */ var BUBBLE_PADDING = 4; 160 /** @const */ var BUBBLE_PADDING = 4;
161 $('bubble').showContentForElement(activatedPod.mainInput, 161 $('bubble').showContentForElement(activatedPod.mainInput,
162 cr.ui.Bubble.Attachment.BOTTOM, 162 cr.ui.Bubble.Attachment.BOTTOM,
163 error, 163 error,
164 BUBBLE_OFFSET, BUBBLE_PADDING); 164 BUBBLE_OFFSET, BUBBLE_PADDING);
165 } 165 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 * Updates the list of available keyboard layouts for a public session pod. 313 * Updates the list of available keyboard layouts for a public session pod.
314 * @param {string} userID The user ID of the public session 314 * @param {string} userID The user ID of the public session
315 * @param {!Object} list List of available keyboard layouts 315 * @param {!Object} list List of available keyboard layouts
316 */ 316 */
317 setPublicSessionKeyboardLayouts: function(userID, list) { 317 setPublicSessionKeyboardLayouts: function(userID, list) {
318 $('pod-row').setPublicSessionKeyboardLayouts(userID, list); 318 $('pod-row').setPublicSessionKeyboardLayouts(userID, list);
319 } 319 }
320 }; 320 };
321 }); 321 });
322 322
OLDNEW
« no previous file with comments | « chrome/test/data/chromeos/oobe_webui_browsertest.js ('k') | ui/login/account_picker/user_pod_row.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698