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

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

Issue 2279883004: Revert of Settings People: Add /signOut route for Disconnect dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
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 d9896c4cd026a0675720ecf6e10a7f3e8fd279fb..91adf9564fa1b865a19a454357be13929050624f 100644
--- a/chrome/browser/resources/settings/people_page/people_page.js
+++ b/chrome/browser/resources/settings/people_page/people_page.js
@@ -10,7 +10,6 @@
is: 'settings-people-page',
behaviors: [
- settings.RouteObserverBehavior,
I18nBehavior,
WebUIListenerBehavior,
<if expr="chromeos">
@@ -140,14 +139,6 @@
</if>
},
- /** @protected */
- currentRouteChanged: function() {
- if (settings.getCurrentRoute() == settings.Route.SIGN_OUT)
- this.$.disconnectDialog.showModal();
- else if (this.$.disconnectDialog.open)
- this.$.disconnectDialog.close();
- },
-
<if expr="chromeos">
/** @private */
getPasswordState_: function(hasPin, enableScreenLock) {
@@ -226,12 +217,12 @@
/** @private */
onDisconnectTap_: function() {
- settings.navigateTo(settings.Route.SIGN_OUT);
+ this.$.disconnectDialog.showModal();
},
/** @private */
onDisconnectCancel_: function() {
- settings.navigateToPreviousRoute();
+ this.$.disconnectDialog.close();
},
/** @private */
@@ -240,7 +231,7 @@
(this.$.deleteProfile && this.$.deleteProfile.checked);
this.syncBrowserProxy_.signOut(deleteProfile);
- settings.navigateToPreviousRoute();
+ this.$.disconnectDialog.close();
},
/** @private */
« no previous file with comments | « chrome/browser/resources/settings/people_page/people_page.html ('k') | chrome/browser/resources/settings/route.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698