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 70365d15396bd034b04fa7129ca3d02ffbfd210d..321af4250ddcc78feabdfe17bfee9010291fae59 100644 |
--- a/chrome/browser/resources/settings/people_page/lock_screen.js |
+++ b/chrome/browser/resources/settings/people_page/lock_screen.js |
@@ -89,11 +89,8 @@ Polymer({ |
/** @override */ |
attached: function() { |
- // 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(settings.Route.LOCK_SCREEN, |
- settings.Route.LOCK_SCREEN); |
+ // Show lock screen if current route has been set to LOCK_SCREEN. |
+ this.showLockScreen_(); |
Dan Beam
2017/02/28 02:49:16
this probably ought to be like maybeShowLockScreen
xiaoyinh(OOO Sep 11-29)
2017/02/28 21:41:16
Thanks for the suggestion. I changed name to be "s
|
this.browserProxy_ = settings.FingerprintBrowserProxyImpl.getInstance(); |
}, |
@@ -201,4 +198,12 @@ Polymer({ |
onEditFingerprints_: function() { |
settings.navigateTo(settings.Route.FINGERPRINT); |
}, |
+ |
+ /** @private */ |
+ showLockScreen_: function() { |
+ if (settings.getCurrentRoute() == settings.Route.LOCK_SCREEN && |
+ !this.setModes_) { |
+ this.$.passwordPrompt.open(); |
+ } |
+ }, |
}); |