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

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

Issue 2968873002: Prevent signin frame size update at first login (Closed)
Patch Set: Add current screen check Created 3 years, 5 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 * Displays correct screen container for given mode and APi version. 691 * Displays correct screen container for given mode and APi version.
692 */ 692 */
693 updateSigninFrameContainers_: function() { 693 updateSigninFrameContainers_: function() {
694 let old_state = this.classList.contains('v2'); 694 let old_state = this.classList.contains('v2');
695 this.classList.toggle('v2', false); 695 this.classList.toggle('v2', false);
696 if ((this.screenMode_ == ScreenMode.DEFAULT || 696 if ((this.screenMode_ == ScreenMode.DEFAULT ||
697 this.screenMode_ == ScreenMode.OFFLINE) && 697 this.screenMode_ == ScreenMode.OFFLINE) &&
698 this.chromeOSApiVersion_ == 2) { 698 this.chromeOSApiVersion_ == 2) {
699 this.classList.toggle('v2', true); 699 this.classList.toggle('v2', true);
700 } 700 }
701 if (this != Oobe.getInstance().currentScreen)
702 return;
701 // Switching between signin-frame-dialog and gaia-step-contents 703 // Switching between signin-frame-dialog and gaia-step-contents
702 // updates screen size. 704 // updates screen size.
703 if (old_state != this.classList.contains('v2')) 705 if (old_state != this.classList.contains('v2'))
704 Oobe.getInstance().updateScreenSize(this); 706 Oobe.getInstance().updateScreenSize(this);
705 }, 707 },
706 708
707 /** 709 /**
708 * Whether the current auth flow is SAML. 710 * Whether the current auth flow is SAML.
709 */ 711 */
710 isSAML: function() { 712 isSAML: function() {
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1174 if (this.screenMode_ != ScreenMode.AD_AUTH) 1176 if (this.screenMode_ != ScreenMode.AD_AUTH)
1175 return; 1177 return;
1176 var adAuthUI = this.getSigninFrame_(); 1178 var adAuthUI = this.getSigninFrame_();
1177 adAuthUI.setUser(username); 1179 adAuthUI.setUser(username);
1178 adAuthUI.setInvalid(errorState); 1180 adAuthUI.setInvalid(errorState);
1179 this.loading = false; 1181 this.loading = false;
1180 Oobe.getInstance().headerHidden = false; 1182 Oobe.getInstance().headerHidden = false;
1181 } 1183 }
1182 }; 1184 };
1183 }); 1185 });
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