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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
574 } else if (credentials.authCode) { | 574 } else if (credentials.authCode) { |
575 if (credentials.hasOwnProperty('authCodeOnly') && | 575 if (credentials.hasOwnProperty('authCodeOnly') && |
576 credentials.authCodeOnly) { | 576 credentials.authCodeOnly) { |
577 chrome.send('completeAuthenticationAuthCodeOnly', | 577 chrome.send('completeAuthenticationAuthCodeOnly', |
578 [credentials.authCode]); | 578 [credentials.authCode]); |
579 } else { | 579 } else { |
580 chrome.send('completeAuthentication', | 580 chrome.send('completeAuthentication', |
581 [credentials.gaiaId, | 581 [credentials.gaiaId, |
582 credentials.email, | 582 credentials.email, |
583 credentials.password, | 583 credentials.password, |
584 credentials.authCode]); | 584 credentials.authCode, |
| 585 credentials.usingSAML]); |
585 } | 586 } |
586 } else { | 587 } else { |
587 chrome.send('completeLogin', | 588 chrome.send('completeLogin', |
588 [credentials.gaiaId, | 589 [credentials.gaiaId, |
589 credentials.email, | 590 credentials.email, |
590 credentials.password, | 591 credentials.password, |
591 credentials.usingSAML]); | 592 credentials.usingSAML]); |
592 } | 593 } |
593 | 594 |
594 this.loading = true; | 595 this.loading = true; |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
724 * For more info see C++ class 'WebUILoginView' which calls this method. | 725 * For more info see C++ class 'WebUILoginView' which calls this method. |
725 * @param {number} error Error code. | 726 * @param {number} error Error code. |
726 * @param {string} url The URL that failed to load. | 727 * @param {string} url The URL that failed to load. |
727 */ | 728 */ |
728 onFrameError: function(error, url) { | 729 onFrameError: function(error, url) { |
729 this.error_ = error; | 730 this.error_ = error; |
730 chrome.send('frameLoadingCompleted', [this.error_]); | 731 chrome.send('frameLoadingCompleted', [this.error_]); |
731 }, | 732 }, |
732 }; | 733 }; |
733 }); | 734 }); |
OLD | NEW |