Settings Router Refactor: Migrate to settings.Route.navigateTo calls.

chrome/browser/resources/settings/route.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.
 
 cr.define('settings', function() {
   /**
    * Class for navigable routes. May only be instantiated within this file.
    * @constructor
    * @param {string} url
    * @private
    */
   var Route = function(url) {
     this.url = url;
 
-    /** @private {?settings.Route} */
-    this.parent_ = null;
+    /** @type {?settings.Route} */
+    this.parent = null;
 
     // Below are all legacy properties to provide compatibility with the old
     // routing system. TODO(tommycli): Remove once routing refactor complete.
     this.page = '';
     this.section = '';
     /** @type {!Array<string>} */ this.subpage = [];
   };
 
   Route.prototype = {
     /**
      * Returns a new Route instance that's a child of this route.
      * @param {string} path Extends this route's path if it doesn't contain a
      *     leading slash.
      * @param {string=} opt_subpageName
      * @return {!settings.Route}
      * @private
      */
     createChild: function(path, opt_subpageName) {
       assert(path);
 
       // |path| extends this route's path if it doesn't have a leading slash.
       // If it does have a leading slash, it's just set as the new route's URL.
       var newUrl = path[0] == '/' ? path : this.url + '/' + path;
 
       var route = new Route(newUrl);
-      route.parent_ = this;
+      route.parent = this;
       route.page = this.page;
       route.section = this.section;
       route.subpage = this.subpage.slice();  // Shallow copy.
 
       if (opt_subpageName)
         route.subpage.push(opt_subpageName);
 
       return route;
     },
 
@@ skipping 23 matching lines @@
       route.section = section;
       return route;
     },
 
     /**
      * Returns true if this route is a descendant of the parameter.
      * @param {!settings.Route} route
      * @return {boolean}
      */
     isDescendantOf: function(route) {
-      for (var parent = this.parent_; parent != null; parent = parent.parent_) {
+      for (var parent = this.parent; parent != null; parent = parent.parent) {
         if (route == parent)
           return true;
       }
 
       return false;
     },
   };
 
   // Abbreviated variable for easier definitions.
   var r = Route;
@@ skipping 36 matching lines @@
   r.QUICK_UNLOCK_CHOOSE_METHOD =
       r.PEOPLE.createChild('/quickUnlock/chooseMethod',
                            'quick-unlock-choose-method');
   r.QUICK_UNLOCK_SETUP_PIN =
       r.QUICK_UNLOCK_CHOOSE_METHOD.createChild('/quickUnlock/setupPin',
                                                'quick-unlock-setup-pin');
   r.ACCOUNTS = r.PEOPLE.createChild('/accounts', 'users');
 
   r.DEVICE = r.BASIC.createSection('/device', 'device');
   r.POINTERS = r.DEVICE.createChild('/pointer-overlay', 'pointers');
-  r.KEYBARD = r.DEVICE.createChild('/keyboard-overlay', 'keyboard');

[Dan Beam, 2016/07/23 00:17:11]

KEYBARRRRRD!

[tommycli, 2016/07/25 16:47:20]

Acknowledged.

+  r.KEYBOARD = r.DEVICE.createChild('/keyboard-overlay', 'keyboard');
   r.DISPLAY = r.DEVICE.createChild('/display', 'display');
 </if>
 
   r.PRIVACY = r.ADVANCED.createSection('/privacy', 'privacy');
   r.CERTIFICATES =
       r.PRIVACY.createChild('/certificates', 'manage-certificates');
   r.CLEAR_BROWSER_DATA =
       r.PRIVACY.createDialog('/clearBrowserData', 'clear-browsing-data');
   r.SITE_SETTINGS = r.PRIVACY.createChild('/siteSettings', 'site-settings');
   r.SITE_SETTINGS_ALL = r.SITE_SETTINGS.createChild('all', 'all-sites');
@@ skipping 101 matching lines @@
   r.RESET = r.ADVANCED.createSection('/reset', 'reset');
 
 <if expr="chromeos">
   r.INPUT_METHODS =
       r.LANGUAGES.createChild('/inputMethods', 'manage-input-methods');
   r.DETAILED_BUILD_INFO =
       r.ABOUT.createChild('/help/details', 'detailed-build-info');
   r.DETAILED_BUILD_INFO.section = 'about';
 </if>
 
+  /**
+   * Use this function (and only this function) to navigate within Settings.
+   * This function is set by settings-router once it is created.
+   * @type {?function(!settings.Route):void}
+   */
+  var navigateTo = null;
+
   return {
     Route: Route,
+    navigateTo: navigateTo,
   };
 });