Settings Router Refactor: Clean up Quick Unlock (and a few misc fixes)

chrome/browser/resources/settings/people_page/quick_unlock_choose_method.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-quick-unlock-choose-method' allows the user to change how they
  * unlock their device. Note that setting up the unlock method is delegated
  * to other elements.
  *
@@ skipping 15 matching lines @@
 var QuickUnlockUnlockType = {
   VALUE_PENDING: 'value_pending',
   NONE: 'none',
   PASSWORD: 'password',
   PIN_PASSWORD: 'pin+password'
 };
 
 Polymer({
   is: 'settings-quick-unlock-choose-method',
 
-  behaviors: [
-    PrefsBehavior, QuickUnlockPasswordDetectBehavior
-  ],
+  behaviors: [PrefsBehavior, QuickUnlockPasswordDetectBehavior],
 
   properties: {
+    /** @type {!settings.Route} */
+    currentRoute: {
+      type: Object,
+      observer: 'onRouteChanged_',
+    },
+
     /** Preferences state. */
     prefs: {
       type: Object,
       notify: true,
     },
 
     /**
      * The currently selected unlock type.
      * @type {!QuickUnlockUnlockType}
      * @private
      */
     selectedUnlockType_: {
       type: String,
       notify: true,
       value: QuickUnlockUnlockType.VALUE_PENDING,
       observer: 'selectedUnlockTypeChanged_'
     }
   },
 
-  observers: [
-    'onRouteChanged_(currentRoute)',
-    'onSetModesChanged_(setModes)'
-  ],
+  observers: ['onSetModesChanged_(setModes)'],
 
   /** @override */
   attached: function() {
     CrSettingsPrefs.initialized.then(this.updateUnlockType_.bind(this));
 
     this.boundOnPrefsChanged_ = function(prefs) {
       for (var i = 0; i < prefs.length; ++i) {
         if (prefs[i].key == ENABLE_LOCK_SCREEN_PREF)
           this.updateUnlockType_();
       }
     }.bind(this);
     this.boundOnActiveModesChanged_ = this.updateUnlockType_.bind(this);
 
     chrome.settingsPrivate.onPrefsChanged.addListener(
         this.boundOnPrefsChanged_);
     chrome.quickUnlockPrivate.onActiveModesChanged.addListener(
         this.boundOnActiveModesChanged_);
 
-    if (this.isScreenActive(QuickUnlockScreen.CHOOSE_METHOD))
+  if (this.currentRoute == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)
       this.askForPasswordIfUnset();
   },
 
   /** @override */
   detached: function() {
     chrome.settingsPrivate.onPrefsChanged.removeListener(
         this.boundOnPrefsChanged_);
     chrome.quickUnlockPrivate.onActiveModesChanged.removeListener(
         this.boundOnActiveModesChanged_);
   },
 
   /** @private */
   onRouteChanged_: function() {
-    if (this.isScreenActive(QuickUnlockScreen.CHOOSE_METHOD))
+    if (this.currentRoute == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)
       this.askForPasswordIfUnset();
   },
 
   /** @private */
   onSetModesChanged_: function() {
-    if (this.isScreenActive(QuickUnlockScreen.CHOOSE_METHOD))
+    if (this.currentRoute == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)
       this.askForPasswordIfUnset();
   },
 
   /**
    * Updates the selected unlock type radio group. This function will get called
    * after preferences are initialized, after the quick unlock mode has been
    * changed, and after the lockscreen preference has changed.
    *
    * @private
    */
@@ skipping 58 matching lines @@
     return selectedUnlockType === QuickUnlockUnlockType.PIN_PASSWORD;
   },
 
   /** @private */
   onConfigurePin_: function() {
     settings.navigateTo(settings.Route.QUICK_UNLOCK_SETUP_PIN);
   },
 });
 
 })();