| Index: chrome/browser/resources/chromeos/login/screen_gaia_signin.js
|
| diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
|
| index ada6dde35b26f97b3ad7c21f6e4172eaecb0f007..7dbfb055c7ce8cd2f4a70ddc5efcaac8f63bbb94 100644
|
| --- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
|
| +++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
|
| @@ -98,8 +98,18 @@ cr.define('login', function() {
|
| * page.
|
| */
|
| onBeforeShow: function(data) {
|
| - console.log('Opening extension: ' + data.startUrl +
|
| - ', opt_email=' + data.email);
|
| + // Announce the name of the screen, if accessibility is on.
|
| + $('gaia-signin-aria-label').setAttribute(
|
| + 'aria-label', localStrings.getString('signinScreenTitle'));
|
| +
|
| + // Button header is always visible when sign in is presented.
|
| + // Header is hidden once GAIA reports on successful sign in.
|
| + Oobe.getInstance().headerHidden = false;
|
| + },
|
| +
|
| + setExtensionUrl_: function(data) {
|
| + $('createAccount').hidden = !data.createAccount;
|
| + $('guestSignin').hidden = !data.guestSignin;
|
|
|
| var params = [];
|
| if (data.gaiaOrigin)
|
| @@ -117,22 +127,19 @@ cr.define('login', function() {
|
| if (params.length)
|
| url += '?' + params.join('&');
|
|
|
| - $('signin-frame').src = url;
|
| - this.extension_url_ = url;
|
| -
|
| - $('createAccount').hidden = !data.createAccount;
|
| - $('guestSignin').hidden = !data.guestSignin;
|
| -
|
| - // Announce the name of the screen, if accessibility is on.
|
| - $('gaia-signin-aria-label').setAttribute(
|
| - 'aria-label', localStrings.getString('signinScreenTitle'));
|
| + if (data.forceReload || this.extension_url_ != url) {
|
| + console.log('Opening extension: ' + data.startUrl +
|
| + ', opt_email=' + data.email);
|
|
|
| - // Button header is always visible when sign in is presented.
|
| - // Header is hidden once GAIA reports on successful sign in.
|
| - Oobe.getInstance().headerHidden = false;
|
| + $('signin-frame').src = url;
|
| + this.extension_url_ = url;
|
|
|
| - this.loading = true;
|
| - this.clearRetry_();
|
| + this.loading = true;
|
| + this.clearRetry_();
|
| + } else if (this.loading) {
|
| + // Probably an error has occurred, so trying to reload.
|
| + this.doReload();
|
| + }
|
| },
|
|
|
| /**
|
| @@ -215,6 +222,10 @@ cr.define('login', function() {
|
| }
|
| };
|
|
|
| + GaiaSigninScreen.setExtensionUrl = function(data) {
|
| + $('gaia-signin').setExtensionUrl_(data);
|
| + };
|
| +
|
| return {
|
| GaiaSigninScreen: GaiaSigninScreen
|
| };
|
|
|