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

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

Issue 2068953003: Revert of Clear the login webview when SAML flow is canceled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/gaia_auth_host/authenticator.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 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.HIDDEN; 550 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.HIDDEN;
551 $('offline-gaia').switchToEmailCard(false /* animated */); 551 $('offline-gaia').switchToEmailCard(false /* animated */);
552 }, 552 },
553 553
554 /** 554 /**
555 * Loads the authentication extension into the iframe. 555 * Loads the authentication extension into the iframe.
556 * @param {Object} data Extension parameters bag. 556 * @param {Object} data Extension parameters bag.
557 * @private 557 * @private
558 */ 558 */
559 loadAuthExtension: function(data) { 559 loadAuthExtension: function(data) {
560 // Redirect the webview to the blank page in order to stop the SAML IdP
561 // page from working in a background (see crbug.com/613245).
562 if (this.screenMode_ == ScreenMode.DEFAULT &&
563 data.screenMode != ScreenMode.DEFAULT) {
564 this.gaiaAuthHost_.resetWebview();
565 }
566
567 this.screenMode = data.screenMode; 560 this.screenMode = data.screenMode;
568 this.email = ''; 561 this.email = '';
569 this.authCompleted_ = false; 562 this.authCompleted_ = false;
570 this.lastBackMessageValue_ = false; 563 this.lastBackMessageValue_ = false;
571 564
572 $('login-header-bar').showCreateSupervisedButton = 565 $('login-header-bar').showCreateSupervisedButton =
573 data.supervisedUsersCanCreate; 566 data.supervisedUsersCanCreate;
574 $('login-header-bar').showGuestButton = data.guestSignin; 567 $('login-header-bar').showGuestButton = data.guestSignin;
575 568
576 // Reset SAML 569 // Reset SAML
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 }, 916 },
924 917
925 /** 918 /**
926 * Clears input fields and switches to input mode. 919 * Clears input fields and switches to input mode.
927 * @param {boolean} takeFocus True to take focus. 920 * @param {boolean} takeFocus True to take focus.
928 * @param {boolean} forceOnline Whether online sign-in should be forced. 921 * @param {boolean} forceOnline Whether online sign-in should be forced.
929 * If |forceOnline| is false previously used sign-in type will be used. 922 * If |forceOnline| is false previously used sign-in type will be used.
930 */ 923 */
931 reset: function(takeFocus, forceOnline) { 924 reset: function(takeFocus, forceOnline) {
932 // Reload and show the sign-in UI if needed. 925 // Reload and show the sign-in UI if needed.
933 this.gaiaAuthHost_.resetStates(); 926 this.gaiaAuthHost_.resetStates_();
934 if (takeFocus) { 927 if (takeFocus) {
935 if (!forceOnline && this.isOffline()) { 928 if (!forceOnline && this.isOffline()) {
936 // Show 'Cancel' button to allow user to return to the main screen 929 // Show 'Cancel' button to allow user to return to the main screen
937 // (e.g. this makes sense when connection is back). 930 // (e.g. this makes sense when connection is back).
938 Oobe.getInstance().headerHidden = false; 931 Oobe.getInstance().headerHidden = false;
939 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.GAIA_SIGNIN; 932 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.GAIA_SIGNIN;
940 // Do nothing, since offline version is reloaded after an error comes. 933 // Do nothing, since offline version is reloaded after an error comes.
941 } else { 934 } else {
942 Oobe.showSigninUI(); 935 Oobe.showSigninUI();
943 } 936 }
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 this.classList.toggle('whitelist-error', show); 1040 this.classList.toggle('whitelist-error', show);
1048 this.loading = !show; 1041 this.loading = !show;
1049 1042
1050 if (!show) 1043 if (!show)
1051 Oobe.showSigninUI(); 1044 Oobe.showSigninUI();
1052 1045
1053 this.updateControlsState(); 1046 this.updateControlsState();
1054 } 1047 }
1055 }; 1048 };
1056 }); 1049 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/gaia_auth_host/authenticator.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698