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

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

Issue 2676763002: MD Settings: Put fingerprints on its own subpage. (Closed)
Patch Set: Fixed patch set 1 errors. Created 3 years, 10 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/lock_screen.js
diff --git a/chrome/browser/resources/settings/people_page/lock_screen.js b/chrome/browser/resources/settings/people_page/lock_screen.js
index 0ea3d20bf0869c2396fdd556009043990ea83774..0b21a2f41c084b690b38993b3b9a900e95d0bacc 100644
--- a/chrome/browser/resources/settings/people_page/lock_screen.js
+++ b/chrome/browser/resources/settings/people_page/lock_screen.js
@@ -83,20 +83,24 @@ Polymer({
// currentRouteChanged is not called during the initial navigation. If the
// user navigates directly to the lockScreen page, we still want to show the
// password prompt page.
- this.currentRouteChanged();
+ this.currentRouteChanged(settings.Route.LOCK_SCREEN,
+ settings.Route.LOCK_SCREEN);
},
/**
* Overridden from settings.RouteObserverBehavior.
+ * @param {!settings.Route} newRoute
+ * @param {!settings.Route} oldRoute
* @protected
*/
- currentRouteChanged: function() {
- if (settings.getCurrentRoute() == settings.Route.LOCK_SCREEN &&
- !this.setModes_) {
+ currentRouteChanged: function(newRoute, oldRoute) {
+ if (newRoute == settings.Route.LOCK_SCREEN && !this.setModes_) {
this.$.passwordPrompt.open();
- } else {
+ } else if (newRoute != settings.Route.FINGERPRINT &&
+ oldRoute != settings.Route.FINGERPRINT) {
// If the user navigated away from the lock screen settings page they will
- // have to re-enter their password.
+ // have to re-enter their password. An exception is if they are navigating
+ // to or from the fingerprint subpage.
this.setModes_ = undefined;
}
},
@@ -163,4 +167,9 @@ Polymer({
this.$.setupPin.open();
this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD);
},
+
+ /** @private */
+ onEditFingerprints_: function() {
+ settings.navigateTo(settings.Route.FINGERPRINT);
+ },
});

Powered by Google App Engine
This is Rietveld 408576698