1 files changed, 23 insertions, 6 deletions
diff --git a/chromium/chrome/browser/resources/settings/people_page/lock_screen.js b/chromium/chrome/browser/resources/settings/people_page/lock_screen.js
index 4edb4a4e9ed..9bc50d77a69 100644
--- a/chromium/chrome/browser/resources/settings/people_page/lock_screen.js
+++ b/chromium/chrome/browser/resources/settings/people_page/lock_screen.js
@@ -195,6 +195,7 @@ Polymer({
         settings.EasyUnlockBrowserProxyImpl.getInstance();
     this.fingerprintBrowserProxy_ =
         settings.FingerprintBrowserProxyImpl.getInstance();
+    this.updateNumFingerprints_();
 
     if (this.easyUnlockAllowed_) {
       this.addWebUIListener(
@@ -214,12 +215,7 @@ Polymer({
   currentRouteChanged: function(newRoute, oldRoute) {
     if (newRoute == settings.routes.LOCK_SCREEN) {
       this.updateUnlockType();
-      if (this.fingerprintUnlockEnabled_ && this.fingerprintBrowserProxy_) {
-        this.fingerprintBrowserProxy_.getNumFingerprints().then(
-            numFingerprints => {
-              this.numFingerprints_ = numFingerprints;
-            });
-      }
+      this.updateNumFingerprints_();
     }
 
     if (this.shouldAskForPassword_(newRoute)) {
@@ -404,4 +400,25 @@ Polymer({
       easyUnlockEnabled, proximityDetectionAllowed) {
     return easyUnlockEnabled && proximityDetectionAllowed;
   },
+
+  /** @private */
+  updateNumFingerprints_: function() {
+    if (this.fingerprintUnlockEnabled_ && this.fingerprintBrowserProxy_) {
+      this.fingerprintBrowserProxy_.getNumFingerprints().then(
+          numFingerprints => {
+            this.numFingerprints_ = numFingerprints;
+          });
+    }
+  },
+
+  /**
+   * Looks up the translation id, which depends on PIN login support.
+   * @param {boolean} hasPinLogin
+   * @private
+   */
+  selectLockScreenOptionsString(hasPinLogin) {
+    if (hasPinLogin)
+      return this.i18n('lockScreenOptionsLoginLock');
+    return this.i18n('lockScreenOptionsLock');
+  },
 });