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

Unified Diff: chrome/browser/resources/settings/people_page/people_page.js

Issue 2442843002: Override SigninManager::SignOut if force-signin is enabled. (Closed)
Patch Set: fix try bot Created 4 years, 1 month 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/signin/chrome_signin_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/people_page/people_page.js
diff --git a/chrome/browser/resources/settings/people_page/people_page.js b/chrome/browser/resources/settings/people_page/people_page.js
index 5ec7f887782a64ae45aecfed3e901df791867242..58cdd0c02349b94502e44e20c310ae7825eaaac6 100644
--- a/chrome/browser/resources/settings/people_page/people_page.js
+++ b/chrome/browser/resources/settings/people_page/people_page.js
@@ -247,9 +247,13 @@ Polymer({
onDisconnectConfirm_: function() {
var deleteProfile = !!this.syncStatus.domain ||
(this.$.deleteProfile && this.$.deleteProfile.checked);
- this.syncBrowserProxy_.signOut(deleteProfile);
-
- this.$.disconnectDialog.close();
+ // Navigate to previous route before signout so session restore does
+ // not restore to the signout dialog. Dialog will be automatically
+ // closed by the route change.
+ settings.navigateToPreviousRoute();
+ setTimeout(function() {
tommycli 2016/11/01 17:28:54 Thinking further on this: I think using setTimeout
Dan Beam 2016/11/01 18:51:38 see also: listenOnce()
+ this.syncBrowserProxy_.signOut(deleteProfile);
+ }.bind(this));
},
/** @private */
« no previous file with comments | « no previous file | chrome/browser/signin/chrome_signin_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698