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

Side by Side Diff: chrome/browser/resources/chromeos/login/header_bar.js

Issue 1217753004: Hide "Add user" button when enrollment screen is active. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment_webview.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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 this.updateUI_(); 305 this.updateUI_();
306 }, 306 },
307 307
308 /** 308 /**
309 * Updates visibility state of action buttons. 309 * Updates visibility state of action buttons.
310 * 310 *
311 * @private 311 * @private
312 */ 312 */
313 updateUI_: function() { 313 updateUI_: function() {
314 var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN); 314 var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN);
315 var enrollmentIsActive =
316 (this.signinUIState_ == SIGNIN_UI_STATE.ENROLLMENT);
315 var accountPickerIsActive = 317 var accountPickerIsActive =
316 (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER); 318 (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER);
317 var supervisedUserCreationDialogIsActive = 319 var supervisedUserCreationDialogIsActive =
318 (this.signinUIState_ == 320 (this.signinUIState_ ==
319 SIGNIN_UI_STATE.SUPERVISED_USER_CREATION_FLOW); 321 SIGNIN_UI_STATE.SUPERVISED_USER_CREATION_FLOW);
320 var wrongHWIDWarningIsActive = 322 var wrongHWIDWarningIsActive =
321 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING); 323 (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING);
322 var isSamlPasswordConfirm = 324 var isSamlPasswordConfirm =
323 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM); 325 (this.signinUIState_ == SIGNIN_UI_STATE.SAML_PASSWORD_CONFIRM);
324 var isEnrollingConsumerManagement = (this.signinUIState_ == 326 var isEnrollingConsumerManagement = (this.signinUIState_ ==
325 SIGNIN_UI_STATE.CONSUMER_MANAGEMENT_ENROLLMENT); 327 SIGNIN_UI_STATE.CONSUMER_MANAGEMENT_ENROLLMENT);
326 var isPasswordChangedUI = 328 var isPasswordChangedUI =
327 (this.signinUIState_ == SIGNIN_UI_STATE.PASSWORD_CHANGED); 329 (this.signinUIState_ == SIGNIN_UI_STATE.PASSWORD_CHANGED);
328 var isMultiProfilesUI = 330 var isMultiProfilesUI =
329 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING); 331 (Oobe.getInstance().displayType == DISPLAY_TYPE.USER_ADDING);
330 var isLockScreen = 332 var isLockScreen =
331 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK); 333 (Oobe.getInstance().displayType == DISPLAY_TYPE.LOCK);
332 var isNewGaiaScreenWithBackButton = 334 var isNewGaiaScreenWithBackButton =
333 gaiaIsActive && 335 gaiaIsActive &&
334 this.isNewGaiaFlow_ && 336 this.isNewGaiaFlow_ &&
335 !($('back-button-item').hidden); 337 !($('back-button-item').hidden);
336 var supervisedUserCreationDialogIsActiveAndNotIntro = 338 var supervisedUserCreationDialogIsActiveAndNotIntro =
337 supervisedUserCreationDialogIsActive && 339 supervisedUserCreationDialogIsActive &&
338 $('supervised-user-creation').currentPage_ != 'intro'; 340 $('supervised-user-creation').currentPage_ != 'intro';
339 341
340 $('add-user-button').hidden = 342 $('add-user-button').hidden =
341 (!this.isNewGaiaFlow_ && !accountPickerIsActive) || 343 (!this.isNewGaiaFlow_ && !accountPickerIsActive) ||
342 (this.isNewGaiaFlow_ && gaiaIsActive) || 344 (this.isNewGaiaFlow_ && gaiaIsActive) ||
345 enrollmentIsActive ||
343 isMultiProfilesUI || 346 isMultiProfilesUI ||
344 isLockScreen || 347 isLockScreen ||
345 supervisedUserCreationDialogIsActiveAndNotIntro; 348 supervisedUserCreationDialogIsActiveAndNotIntro;
346 $('more-settings-header-bar-item').hidden = 349 $('more-settings-header-bar-item').hidden =
347 !this.showCreateSupervised_ || 350 !this.showCreateSupervised_ ||
348 isNewGaiaScreenWithBackButton || 351 isNewGaiaScreenWithBackButton ||
349 supervisedUserCreationDialogIsActive; 352 supervisedUserCreationDialogIsActive;
350 $('cancel-add-user-button').hidden = 353 $('cancel-add-user-button').hidden =
351 ((gaiaIsActive || isPasswordChangedUI || isSamlPasswordConfirm) && 354 ((gaiaIsActive || isPasswordChangedUI || isSamlPasswordConfirm) &&
352 this.isNewGaiaFlow_) || 355 this.isNewGaiaFlow_) ||
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 * Convenience wrapper of animateIn. 446 * Convenience wrapper of animateIn.
444 */ 447 */
445 HeaderBar.animateIn = function(fast, callback) { 448 HeaderBar.animateIn = function(fast, callback) {
446 $('login-header-bar').animateIn(fast, callback); 449 $('login-header-bar').animateIn(fast, callback);
447 }; 450 };
448 451
449 return { 452 return {
450 HeaderBar: HeaderBar 453 HeaderBar: HeaderBar
451 }; 454 };
452 }); 455 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment_webview.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698