Settings Router Refactor: Kill settings-router.

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.
  *
  * Example:
  *
  * <settings-quick-unlock-choose-method
  *   set-modes="[[quickUnlockSetModes]]"
- *   current-route="{{currentRoute}}"
  *   prefs="{{prefs}}">
  * </settings-quick-unlock-choose-method>
  */
 
 (function() {
 'use strict';
 
 /** @const */ var ENABLE_LOCK_SCREEN_PREF = 'settings.enable_screen_lock';
 
 /** @enum {string} */
 var QuickUnlockUnlockType = {
   VALUE_PENDING: 'value_pending',
   NONE: 'none',
   PASSWORD: 'password',
   PIN_PASSWORD: 'pin+password'
 };
 
 Polymer({
   is: 'settings-quick-unlock-choose-method',
 
   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
@@ skipping 18 matching lines @@
           this.updateUnlockType_();
       }
     }.bind(this);
     this.boundOnActiveModesChanged_ = this.updateUnlockType_.bind(this);
 
     chrome.settingsPrivate.onPrefsChanged.addListener(
         this.boundOnPrefsChanged_);
     chrome.quickUnlockPrivate.onActiveModesChanged.addListener(
         this.boundOnActiveModesChanged_);
 
-  if (this.currentRoute == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)
+  if (settings.getCurrentRoute() == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)

[Dan Beam, 2016/08/05 18:25:19]

indent off

[tommycli, 2016/08/05 18:54:06]

Done.

       this.askForPasswordIfUnset();
   },
 
   /** @override */
   detached: function() {
     chrome.settingsPrivate.onPrefsChanged.removeListener(
         this.boundOnPrefsChanged_);
     chrome.quickUnlockPrivate.onActiveModesChanged.removeListener(
         this.boundOnActiveModesChanged_);
   },
 
-  /** @private */
-  onRouteChanged_: function() {
-    if (this.currentRoute == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)
+  /** @protected */
+  currentRouteChanged: function() {
+    if (settings.getCurrentRoute() == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)
       this.askForPasswordIfUnset();
   },
 
   /** @private */
   onSetModesChanged_: function() {
-    if (this.currentRoute == settings.Route.QUICK_UNLOCK_CHOOSE_METHOD)
+    if (settings.getCurrentRoute() == 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);
   },
 });
 
 })();