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

Side by Side Diff: chrome/browser/resources/login/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: fix2 Created 6 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 | 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 * @param {HTMLElement} content Content to show in bubble. 142 * @param {HTMLElement} content Content to show in bubble.
143 */ 143 */
144 showErrorBubble: function(loginAttempts, error) { 144 showErrorBubble: function(loginAttempts, error) {
145 var activatedPod = $('pod-row').activatedPod; 145 var activatedPod = $('pod-row').activatedPod;
146 if (!activatedPod) { 146 if (!activatedPod) {
147 $('bubble').showContentForElement($('pod-row'), 147 $('bubble').showContentForElement($('pod-row'),
148 cr.ui.Bubble.Attachment.RIGHT, 148 cr.ui.Bubble.Attachment.RIGHT,
149 error); 149 error);
150 return; 150 return;
151 } 151 }
152 // Show web authentication if this is not a locally managed user. 152 // Show web authentication if this is not a supervised user.
153 if (loginAttempts > MAX_LOGIN_ATTEMPTS_IN_POD && 153 if (loginAttempts > MAX_LOGIN_ATTEMPTS_IN_POD &&
154 !activatedPod.user.locallyManagedUser) { 154 !activatedPod.user.supervisedUser) {
155 activatedPod.showSigninUI(); 155 activatedPod.showSigninUI();
156 } else { 156 } else {
157 // We want bubble's arrow to point to the first letter of input. 157 // We want bubble's arrow to point to the first letter of input.
158 /** @const */ var BUBBLE_OFFSET = 7; 158 /** @const */ var BUBBLE_OFFSET = 7;
159 /** @const */ var BUBBLE_PADDING = 4; 159 /** @const */ var BUBBLE_PADDING = 4;
160 $('bubble').showContentForElement(activatedPod.mainInput, 160 $('bubble').showContentForElement(activatedPod.mainInput,
161 cr.ui.Bubble.Attachment.BOTTOM, 161 cr.ui.Bubble.Attachment.BOTTOM,
162 error, 162 error,
163 BUBBLE_OFFSET, BUBBLE_PADDING); 163 BUBBLE_OFFSET, BUBBLE_PADDING);
164 } 164 }
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 /** 304 /**
305 * Shows a tooltip bubble explaining Easy Unlock. 305 * Shows a tooltip bubble explaining Easy Unlock.
306 */ 306 */
307 showEasyUnlockBubble: function() { 307 showEasyUnlockBubble: function() {
308 $('pod-row').showEasyUnlockBubble(); 308 $('pod-row').showEasyUnlockBubble();
309 } 309 }
310 }; 310 };
311 }); 311 });
312 312
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698