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

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

Issue 2210933004: Settings Router Refactor: Kill settings-router. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge 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/quick_unlock_authenticate.js
diff --git a/chrome/browser/resources/settings/people_page/quick_unlock_authenticate.js b/chrome/browser/resources/settings/people_page/quick_unlock_authenticate.js
index b2bae7663f8fc8ab29797be91deedfaf344c2141..8fed447b6aa445c17d4759fab4c15a3fef329c23 100644
--- a/chrome/browser/resources/settings/people_page/quick_unlock_authenticate.js
+++ b/chrome/browser/resources/settings/people_page/quick_unlock_authenticate.js
@@ -16,9 +16,8 @@
* Example:
*
* <settings-quick-unlock-authenticate
- * set-modes="[[setModes]]"
- * current-route="{{currentRoute}}"
- * profile-name="[[profileName_]]">
+ * set-modes="[[setModes]]"
+ * profile-name="[[profileName_]]">
* </settings-quick-unlock-authenticate>
*/
@@ -46,13 +45,9 @@ function checkAccountPassword_(password, onCheck) {
Polymer({
is: 'settings-quick-unlock-authenticate',
- properties: {
- /** @type {!settings.Route} */
- currentRoute: {
- type: Object,
- observer: 'onRouteChanged_',
- },
+ behavior: [settings.RouteObserverBehavior],
+ properties: {
/**
* A wrapper around chrome.quickUnlockPrivate.setModes with the account
* password already supplied. If this is null, the authentication screen
@@ -85,14 +80,15 @@ Polymer({
passwordInvalid_: Boolean
},
- /** @private */
- onRouteChanged_: function(currentRoute) {
+ /** @protected */
+ currentRouteChanged: function() {
// Clear local state if this screen is not active so if this screen shows
// up again the user will get a fresh UI.
- if (this.currentRoute != settings.Route.QUICK_UNLOCK_AUTHENTICATE) {
- this.password_ = '';
- this.passwordInvalid_ = false;
- }
+ if (settings.getCurrentRoute() == settings.Route.QUICK_UNLOCK_AUTHENTICATE)
+ return;
+
+ this.password_ = '';
+ this.passwordInvalid_ = false;
},
/**

Powered by Google App Engine
This is Rietveld 408576698