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

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

Issue 1229883003: ChromeOS: should send old user GAPS cookie to GAIA on user reauthentication. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 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
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 loading time after which error message must be displayed and 10 // Gaia loading time after which error message must be displayed and
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 if (credentials.hasOwnProperty('authCodeOnly') && 727 if (credentials.hasOwnProperty('authCodeOnly') &&
728 credentials.authCodeOnly) { 728 credentials.authCodeOnly) {
729 chrome.send('completeAuthenticationAuthCodeOnly', 729 chrome.send('completeAuthenticationAuthCodeOnly',
730 [credentials.authCode]); 730 [credentials.authCode]);
731 } else { 731 } else {
732 chrome.send('completeAuthentication', [ 732 chrome.send('completeAuthentication', [
733 credentials.gaiaId, 733 credentials.gaiaId,
734 credentials.email, 734 credentials.email,
735 credentials.password, 735 credentials.password,
736 credentials.authCode, 736 credentials.authCode,
737 credentials.usingSAML 737 credentials.usingSAML,
738 credentials.gapsCookie
738 ]); 739 ]);
739 } 740 }
740 } else { 741 } else {
741 chrome.send('completeLogin', 742 chrome.send('completeLogin',
742 [credentials.gaiaId, 743 [credentials.gaiaId,
743 credentials.email, 744 credentials.email,
744 credentials.password, 745 credentials.password,
745 credentials.usingSAML]); 746 credentials.usingSAML]);
746 } 747 }
747 748
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 } 936 }
936 937
937 this.classList.toggle('whitelist-error', show); 938 this.classList.toggle('whitelist-error', show);
938 this.loading = !show; 939 this.loading = !show;
939 940
940 if (!show) 941 if (!show)
941 Oobe.showSigninUI(); 942 Oobe.showSigninUI();
942 } 943 }
943 }; 944 };
944 }); 945 });
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/resources/gaia_auth_host/authenticator.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698