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

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

Issue 2891373003: cros: Fix "close" button visible during sign-in (Closed)
Patch Set: Created 3 years, 7 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 !this.loading && 149 !this.loading &&
150 !this.isSAML(); 150 !this.isSAML();
151 151
152 this.navigation_.refreshVisible = 152 this.navigation_.refreshVisible =
153 !this.closable && this.isAtTheBeginning() && 153 !this.closable && this.isAtTheBeginning() &&
154 this.screenMode_ != ScreenMode.SAML_INTERSTITIAL; 154 this.screenMode_ != ScreenMode.SAML_INTERSTITIAL;
155 155
156 this.navigation_.closeVisible = 156 this.navigation_.closeVisible =
157 !this.navigation_.refreshVisible && 157 !this.navigation_.refreshVisible &&
158 !isWhitelistError && 158 !isWhitelistError &&
159 !this.authCompleted && 159 !this.authCompleted_ &&
160 this.screenMode_ != ScreenMode.SAML_INTERSTITIAL; 160 this.screenMode_ != ScreenMode.SAML_INTERSTITIAL;
161 161
162 $('login-header-bar').updateUI_(); 162 $('login-header-bar').updateUI_();
163 }, 163 },
164 164
165 /** 165 /**
166 * SAML password confirmation attempt count. 166 * SAML password confirmation attempt count.
167 * @type {number} 167 * @type {number}
168 */ 168 */
169 samlPasswordConfirmAttempt_: 0, 169 samlPasswordConfirmAttempt_: 0,
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 if (this.screenMode_ != ScreenMode.AD_AUTH) 1130 if (this.screenMode_ != ScreenMode.AD_AUTH)
1131 return; 1131 return;
1132 var adAuthUI = this.getSigninFrame_(); 1132 var adAuthUI = this.getSigninFrame_();
1133 adAuthUI.setUser(username); 1133 adAuthUI.setUser(username);
1134 adAuthUI.setInvalid(errorState); 1134 adAuthUI.setInvalid(errorState);
1135 this.loading = false; 1135 this.loading = false;
1136 Oobe.getInstance().headerHidden = false; 1136 Oobe.getInstance().headerHidden = false;
1137 } 1137 }
1138 }; 1138 };
1139 }); 1139 });
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