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 loading time after which error message must be displayed and | 10 // Gaia loading time after which error message must be displayed and |
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
593 } else if (credentials.authCode) { | 593 } else if (credentials.authCode) { |
594 if (credentials.hasOwnProperty('authCodeOnly') && | 594 if (credentials.hasOwnProperty('authCodeOnly') && |
595 credentials.authCodeOnly) { | 595 credentials.authCodeOnly) { |
596 chrome.send('completeAuthenticationAuthCodeOnly', | 596 chrome.send('completeAuthenticationAuthCodeOnly', |
597 [credentials.authCode]); | 597 [credentials.authCode]); |
598 } else { | 598 } else { |
599 chrome.send('completeAuthentication', | 599 chrome.send('completeAuthentication', |
600 [credentials.gaiaId, | 600 [credentials.gaiaId, |
601 credentials.email, | 601 credentials.email, |
602 credentials.password, | 602 credentials.password, |
603 credentials.authCode]); | 603 credentials.authCode, |
| 604 credentials.usingSAML]); |
604 } | 605 } |
605 } else { | 606 } else { |
606 chrome.send('completeLogin', | 607 chrome.send('completeLogin', |
607 [credentials.gaiaId, | 608 [credentials.gaiaId, |
608 credentials.email, | 609 credentials.email, |
609 credentials.password, | 610 credentials.password, |
610 credentials.usingSAML]); | 611 credentials.usingSAML]); |
611 } | 612 } |
612 | 613 |
613 this.loading = true; | 614 this.loading = true; |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
743 * For more info see C++ class 'WebUILoginView' which calls this method. | 744 * For more info see C++ class 'WebUILoginView' which calls this method. |
744 * @param {number} error Error code. | 745 * @param {number} error Error code. |
745 * @param {string} url The URL that failed to load. | 746 * @param {string} url The URL that failed to load. |
746 */ | 747 */ |
747 onFrameError: function(error, url) { | 748 onFrameError: function(error, url) { |
748 this.error_ = error; | 749 this.error_ = error; |
749 chrome.send('frameLoadingCompleted', [this.error_]); | 750 chrome.send('frameLoadingCompleted', [this.error_]); |
750 }, | 751 }, |
751 }; | 752 }; |
752 }); | 753 }); |
OLD | NEW |