Index: chrome/browser/resources/gaia_auth/background.js |
diff --git a/chrome/browser/resources/gaia_auth/background.js b/chrome/browser/resources/gaia_auth/background.js |
index 3baafc2c332103425c7787c50207c86f61b67886..6d13910111f18371157546c01a7f083c9549bd2f 100644 |
--- a/chrome/browser/resources/gaia_auth/background.js |
+++ b/chrome/browser/resources/gaia_auth/background.js |
@@ -124,6 +124,9 @@ BackgroundBridge.prototype = { |
// header 'google-accounts-signin'. |
sessionIndex_: null, |
+ // Whether the user needs to confirm signin because of insecure content. |
+ confirmUntrustedSignin_: false, |
+ |
// Gaia URL base that is set from main auth script. |
gaiaUrl_: null, |
@@ -223,7 +226,8 @@ BackgroundBridge.prototype = { |
'email': this.email_, |
'password': passwords[0], |
'sessionIndex': this.sessionIndex_, |
- 'skipForNow': skipForNow |
+ 'skipForNow': skipForNow, |
+ 'confirmUntrustedSignin': this.confirmUntrustedSignin_ |
}; |
this.channelMain_.send(msg); |
} else if (this.isConstrainedWindow_) { |
@@ -251,8 +255,10 @@ BackgroundBridge.prototype = { |
* @return {!Object} Decision whether to block the request. |
*/ |
onInsecureRequest: function(url) { |
- if (!this.blockInsecureContent_) |
+ if (!this.blockInsecureContent_) { |
+ this.confirmUntrustedSignin_ = true; |
return {}; |
+ } |
this.channelMain_.send({name: 'onInsecureContentBlocked', url: url}); |
return {cancel: true}; |
}, |