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

Unified Diff: chrome/browser/resources/chromeos/login/screen_gaia_signin.js

Issue 2082533002: Reland of Clear the login webview when SAML flow is canceled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Avoid raising "ready" event too early due to redirection of an empty webview Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/gaia_auth_host/authenticator.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 112edf5bccbc728f0f1ef879829562146c7932fe..e61d4f43d3d7c2bc4af7c8e80b35002feba3a63c 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
@@ -557,6 +557,13 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
* @private
*/
loadAuthExtension: function(data) {
+ // Redirect the webview to the blank page in order to stop the SAML IdP
+ // page from working in a background (see crbug.com/613245).
+ if (this.screenMode_ == ScreenMode.DEFAULT &&
+ data.screenMode != ScreenMode.DEFAULT) {
+ this.gaiaAuthHost_.resetWebview();
+ }
+
this.screenMode = data.screenMode;
this.email = '';
this.authCompleted_ = false;
@@ -923,7 +930,7 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
*/
reset: function(takeFocus, forceOnline) {
// Reload and show the sign-in UI if needed.
- this.gaiaAuthHost_.resetStates_();
+ this.gaiaAuthHost_.resetStates();
if (takeFocus) {
if (!forceOnline && this.isOffline()) {
// Show 'Cancel' button to allow user to return to the main screen
« no previous file with comments | « no previous file | chrome/browser/resources/gaia_auth_host/authenticator.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698