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

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

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