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

Side by Side Diff: chrome/browser/resources/chromeos/login/header_bar.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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/resources/chromeos/login/login.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 Login UI header bar implementation. 6 * @fileoverview Login UI header bar implementation.
7 */ 7 */
8 8
9 cr.define('login', function() { 9 cr.define('login', function() {
10 /** 10 /**
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 199
200 /** 200 /**
201 * Updates visibility state of action buttons. 201 * Updates visibility state of action buttons.
202 * 202 *
203 * @private 203 * @private
204 */ 204 */
205 updateUI_: function() { 205 updateUI_: function() {
206 var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN); 206 var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN);
207 var accountPickerIsActive = 207 var accountPickerIsActive =
208 (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER); 208 (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER);
209 var managedUserCreationDialogIsActive = 209 var supervisedUserCreationDialogIsActive =
210 (this.signinUIState_ == SIGNIN_UI_STATE.MANAGED_USER_CREATION_FLOW); 210 (this.signinUIState_ ==
211 SIGNIN_UI_STATE.SUPERVISED_USER_CREATION_FLOW);
211 var wrongHWIDWarningIsActive = 212 var wrongHWIDWarningIsActive =
212 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING); 213 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING);
213 var isSamlPasswordConfirm = 214 var isSamlPasswordConfirm =
214 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM); 215 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM);
215 var isMultiProfilesUI = 216 var isMultiProfilesUI =
216 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING); 217 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING);
217 var isLockScreen = 218 var isLockScreen =
218 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK); 219 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK);
219 220
220 $('add-user-button').hidden = 221 $('add-user-button').hidden =
221 !accountPickerIsActive || isMultiProfilesUI || isLockScreen; 222 !accountPickerIsActive || isMultiProfilesUI || isLockScreen;
222 $('cancel-add-user-button').hidden = accountPickerIsActive || 223 $('cancel-add-user-button').hidden = accountPickerIsActive ||
223 !this.allowCancel_ || 224 !this.allowCancel_ ||
224 wrongHWIDWarningIsActive || 225 wrongHWIDWarningIsActive ||
225 isMultiProfilesUI; 226 isMultiProfilesUI;
226 $('guest-user-header-bar-item').hidden = gaiaIsActive || 227 $('guest-user-header-bar-item').hidden = gaiaIsActive ||
227 managedUserCreationDialogIsActive || 228 supervisedUserCreationDialogIsActive ||
228 !this.showGuest_ || 229 !this.showGuest_ ||
229 wrongHWIDWarningIsActive || 230 wrongHWIDWarningIsActive ||
230 isSamlPasswordConfirm || 231 isSamlPasswordConfirm ||
231 isMultiProfilesUI; 232 isMultiProfilesUI;
232 $('sign-out-user-item').hidden = !isLockScreen; 233 $('sign-out-user-item').hidden = !isLockScreen;
233 234
234 $('add-user-header-bar-item').hidden = 235 $('add-user-header-bar-item').hidden =
235 $('add-user-button').hidden && $('cancel-add-user-button').hidden; 236 $('add-user-button').hidden && $('cancel-add-user-button').hidden;
236 $('apps-header-bar-item').hidden = !this.hasApps_ || 237 $('apps-header-bar-item').hidden = !this.hasApps_ ||
237 (!gaiaIsActive && !accountPickerIsActive); 238 (!gaiaIsActive && !accountPickerIsActive);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 */ 298 */
298 HeaderBar.animateOut = function(callback) { 299 HeaderBar.animateOut = function(callback) {
299 $('login-header-bar').animateOut(callback); 300 $('login-header-bar').animateOut(callback);
300 }; 301 };
301 302
302 /** 303 /**
303 * Convenience wrapper of animateIn. 304 * Convenience wrapper of animateIn.
304 */ 305 */
305 HeaderBar.animateIn = function(callback) { 306 HeaderBar.animateIn = function(callback) {
306 $('login-header-bar').animateIn(callback); 307 $('login-header-bar').animateIn(callback);
307 } 308 };
308 309
309 return { 310 return {
310 HeaderBar: HeaderBar 311 HeaderBar: HeaderBar
311 }; 312 };
312 }); 313 });
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/resources/chromeos/login/login.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698