Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 916 }, | 916 }, |
| 917 | 917 |
| 918 /** | 918 /** |
| 919 * Clears input fields and switches to input mode. | 919 * Clears input fields and switches to input mode. |
| 920 * @param {boolean} takeFocus True to take focus. | 920 * @param {boolean} takeFocus True to take focus. |
| 921 * @param {boolean} forceOnline Whether online sign-in should be forced. | 921 * @param {boolean} forceOnline Whether online sign-in should be forced. |
| 922 * 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. |
| 923 */ | 923 */ |
| 924 reset: function(takeFocus, forceOnline) { | 924 reset: function(takeFocus, forceOnline) { |
| 925 // Reload and show the sign-in UI if needed. | 925 // Reload and show the sign-in UI if needed. |
| 926 this.gaiaAuthHost_.resetStates_(); | 926 this.gaiaAuthHost_.reload(); |
|
emaxx
2016/05/19 19:02:16
Authenticator.prototype.reload does the same as Au
xiyuan
2016/05/19 22:47:08
We have a policy to make Gaia auto redirect to sam
afakhry
2016/05/20 00:14:21
Authenticator.prototype.reload() doesn't reset the
emaxx
2016/05/23 15:00:48
OK, restored this back to calling resetStates_. An
| |
| 927 if (takeFocus) { | 927 if (takeFocus) { |
| 928 if (!forceOnline && this.isOffline()) { | 928 if (!forceOnline && this.isOffline()) { |
| 929 // 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 |
| 930 // (e.g. this makes sense when connection is back). | 930 // (e.g. this makes sense when connection is back). |
| 931 Oobe.getInstance().headerHidden = false; | 931 Oobe.getInstance().headerHidden = false; |
| 932 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.GAIA_SIGNIN; | 932 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.GAIA_SIGNIN; |
| 933 // Do nothing, since offline version is reloaded after an error comes. | 933 // Do nothing, since offline version is reloaded after an error comes. |
| 934 } else { | 934 } else { |
| 935 Oobe.showSigninUI(); | 935 Oobe.showSigninUI(); |
| 936 } | 936 } |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1040 this.classList.toggle('whitelist-error', show); | 1040 this.classList.toggle('whitelist-error', show); |
| 1041 this.loading = !show; | 1041 this.loading = !show; |
| 1042 | 1042 |
| 1043 if (!show) | 1043 if (!show) |
| 1044 Oobe.showSigninUI(); | 1044 Oobe.showSigninUI(); |
| 1045 | 1045 |
| 1046 this.updateControlsState(); | 1046 this.updateControlsState(); |
| 1047 } | 1047 } |
| 1048 }; | 1048 }; |
| 1049 }); | 1049 }); |
| OLD | NEW |