fix quick unlock config in options

chrome/browser/resources/settings/people_page/lock_screen.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * 'settings-lock-screen' allows the user to change how they unlock their
  * device.
  *
  * Example:
@@ skipping 71 matching lines @@
   },
 
   /** @private {?settings.FingerprintBrowserProxy} */
   browserProxy_: null,
 
   /** selectedUnlockType is defined in LockStateBehavior. */
   observers: ['selectedUnlockTypeChanged_(selectedUnlockType)'],
 
   /** @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_() or
showLockScreenIfNecessary_() or maybe

/**
 * @param {!settings.Route} route
 * @return {boolean} Whether the lock screen should be shown.
 */
shouldShowLockScreen_: function(route) {
  return route == settings.Route.LOCK_SCREEN && !this.setModes_;
},

and then:

attached: function() {
  if (this.shouldShowLockScreen_(settings.getCurrentRoute()))
    this.$.passwordPrompt.open();
},

as well as something similar in currentRouteChanged()

[xiaoyinh(OOO Sep 11-29), 2017/02/28 21:41:16]

Thanks for the suggestion. I changed name to be "shouldAskForPassword_" since we
will open a password dialog if returns true.
LockScreen here probably includes more things like setup pin, edit fingerprint
etc.
Please let me know if you think otherwise.

     this.browserProxy_ = settings.FingerprintBrowserProxyImpl.getInstance();
   },
 
   /**
    * Overridden from settings.RouteObserverBehavior.
    * @param {!settings.Route} newRoute
    * @param {!settings.Route} oldRoute
    * @protected
    */
   currentRouteChanged: function(newRoute, oldRoute) {
     if (newRoute == settings.Route.LOCK_SCREEN &&
         this.fingerprintUnlockEnabled_ &&
         this.browserProxy_) {
       this.browserProxy_.getNumFingerprints().then(
           function(numFingerprints) {
             this.numFingerprints_ = numFingerprints;
           }.bind(this));
     }
 
     if (newRoute == settings.Route.LOCK_SCREEN && !this.setModes_) {
       this.$.passwordPrompt.open();

[Dan Beam, 2017/02/28 02:49:16]

right, but you didn't update this part of the code to use showLockScreen_

[xiaoyinh(OOO Sep 11-29), 2017/02/28 21:41:16]

Oh, thanks! I've updated it.

     } 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. An exception is if they are navigating
       // to or from the fingerprint subpage.
       this.setModes_ = undefined;
     }
   },
 
   /**
@@ skipping 66 matching lines @@
   onConfigurePin_: function(e) {
     e.preventDefault();
     this.$.setupPin.open();
     this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD);
   },
 
   /** @private */
   onEditFingerprints_: function() {
     settings.navigateTo(settings.Route.FINGERPRINT);
   },
+
+  /** @private */
+  showLockScreen_: function() {
+    if (settings.getCurrentRoute() == settings.Route.LOCK_SCREEN &&
+        !this.setModes_) {
+      this.$.passwordPrompt.open();
+    }
+  },
 });