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

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

Issue 1845243006: Fix SAML Interstitial not shown when pre-existing user pod exists (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | no next file » | 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 Oobe signin screen implementation. 6 * @fileoverview Oobe signin screen implementation.
7 */ 7 */
8 8
9 login.createScreen('GaiaSigninScreen', 'gaia-signin', function() { 9 login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
10 // GAIA animation guard timer. Started when GAIA page is loaded 10 // GAIA animation guard timer. Started when GAIA page is loaded
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 } 555 }
556 556
557 params.isNewGaiaFlow = true; 557 params.isNewGaiaFlow = true;
558 params.doSamlRedirect = 558 params.doSamlRedirect =
559 (this.screenMode_ == ScreenMode.SAML_INTERSTITIAL); 559 (this.screenMode_ == ScreenMode.SAML_INTERSTITIAL);
560 560
561 // Screen size could have been changed because of 'full-width' classes. 561 // Screen size could have been changed because of 'full-width' classes.
562 if (Oobe.getInstance().currentScreen === this) 562 if (Oobe.getInstance().currentScreen === this)
563 Oobe.getInstance().updateScreenSize(this); 563 Oobe.getInstance().updateScreenSize(this);
564 564
565 if (data.forceReload || 565 this.gaiaAuthParams_ = params;
566 JSON.stringify(this.gaiaAuthParams_) != JSON.stringify(params)) { 566 switch (this.screenMode_) {
567 this.gaiaAuthParams_ = params; 567 case ScreenMode.DEFAULT:
568 this.loadGaiaAuthHost_(false /* doSamlRedirect */);
569 break;
568 570
569 switch (this.screenMode_) { 571 case ScreenMode.OFFLINE:
570 case ScreenMode.DEFAULT: 572 this.loadOffline(params);
571 this.loadGaiaAuthHost_(false /* doSamlRedirect */); 573 break;
572 break;
573 574
574 case ScreenMode.OFFLINE: 575 case ScreenMode.SAML_INTERSTITIAL:
575 this.loadOffline(params); 576 $('saml-interstitial').domain = data.enterpriseDomain;
576 break; 577 if (this.loading)
577 578 this.loading = false;
578 case ScreenMode.SAML_INTERSTITIAL: 579 break;
579 $('saml-interstitial').domain = data.enterpriseDomain;
580 if (this.loading)
581 this.loading = false;
582 break;
583 }
584 } 580 }
585 this.updateControlsState(); 581 this.updateControlsState();
586 }, 582 },
587 583
588 /** 584 /**
589 * Updates the authentication extension with new parameters, if needed. 585 * Updates the authentication extension with new parameters, if needed.
590 * @param {Object} data New extension parameters bag. 586 * @param {Object} data New extension parameters bag.
591 * @private 587 * @private
592 */ 588 */
593 updateAuthExtension_: function(data) { 589 updateAuthExtension_: function(data) {
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 this.classList.toggle('whitelist-error', show); 988 this.classList.toggle('whitelist-error', show);
993 this.loading = !show; 989 this.loading = !show;
994 990
995 if (!show) 991 if (!show)
996 Oobe.showSigninUI(); 992 Oobe.showSigninUI();
997 993
998 this.updateControlsState(); 994 this.updateControlsState();
999 } 995 }
1000 }; 996 };
1001 }); 997 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698