MD Settings: add a concept of "Canonical routes", which include URLs

chrome/browser/resources/settings/settings_page/settings_router.js

Index: chrome/browser/resources/settings/settings_page/settings_router.js
diff --git a/chrome/browser/resources/settings/settings_page/settings_router.js b/chrome/browser/resources/settings/settings_page/settings_router.js
index 5f5680a91950dd7750bf42fbc0ce9cc85e63efda..cf987729e2bfd677309fd865ec477f71a459f761 100644
--- a/chrome/browser/resources/settings/settings_page/settings_router.js
+++ b/chrome/browser/resources/settings/settings_page/settings_router.js
@@ -8,11 +8,16 @@
  *   page: string,
  *   section: string,
  *   subpage: !Array<string>,
- *   url: (string|undefined),
  * }}
  */
 var SettingsRoute;
 
+/** @typedef {SettingsRoute|{url: string}} */
+var CanonicalRoute;
+
+/** @typedef {SettingsRoute|{inHistory: boolean}} */
+var HistoricRoute;
+
 /**
  * @fileoverview
  * 'settings-router' is a simple router for settings. Its responsibilities:
@@ -49,23 +54,24 @@ Polymer({
       observer: 'currentRouteChanged_',
       type: Object,
       value: function() {
+        var initialRoute = this.canonicalRoutes_[0];
+
         // Take the current URL, find a matching pre-defined route, and
         // initialize the currentRoute to that pre-defined route.
-        for (var i = 0; i < this.routes_.length; ++i) {
-          var route = this.routes_[i];
-          if (route.url == window.location.pathname) {
-            return {
-              url: route.url,
-              page: route.page,
-              section: route.section,
-              subpage: route.subpage,
-              dialog: route.dialog,
-            };
+        for (var i = 0; i < this.canonicalRoutes_.length; ++i) {
+          var canonicalRoute = this.canonicalRoutes_[i];
+          if (canonicalRoute.url == window.location.pathname) {
+            initialRoute = canonicalRoute;
+            break;
           }
         }
 
-        // As a fallback return the default route.
-        return this.routes_[0];
+        return {
+          page: initialRoute.page,
+          section: initialRoute.section,
+          subpage: initialRoute.subpage,
+          dialog: initialRoute.dialog,
+        };
       },
     },
 
@@ -87,10 +93,10 @@ Polymer({
 
 
   /**
-   * @private {!Array<!SettingsRoute>}
+   * @private {!Array<!CanonicalRoute>}
    * The 'url' property is not accessible to other elements.
    */
-  routes_: [
+  canonicalRoutes_: [
     {
       url: '/',
       page: 'basic',
@@ -591,42 +597,43 @@ Polymer({
    * @private
    */
   currentRouteChanged_: function(newRoute, oldRoute) {
-    for (var i = 0; i < this.routes_.length; ++i) {
-      var route = this.routes_[i];
-      if (route.page == newRoute.page &&
-          route.section == newRoute.section &&
-          route.dialog == newRoute.dialog &&
-          route.subpage.length == newRoute.subpage.length &&
-          newRoute.subpage.every(function(value, index) {
-            return value == route.subpage[index];
+    for (var i = 0; i < this.canonicalRoutes_.length; ++i) {
+      var canonicalRoute = this.canonicalRoutes_[i];
+      if (canonicalRoute.page == newRoute.page &&
+          canonicalRoute.section == newRoute.section &&
+          canonicalRoute.dialog == newRoute.dialog &&
+          canonicalRoute.subpage.length == newRoute.subpage.length &&
+          canonicalRoute.subpage.every(function(value, index) {
+            return value == newRoute.subpage[index];
           })) {
         // Update the property containing the titles for the current route.
         this.currentRouteTitles = {
-          pageTitle: loadTimeData.getString(route.page + 'PageTitle'),
+          pageTitle: loadTimeData.getString(canonicalRoute.page + 'PageTitle'),
         };
 
         // If we are restoring a state from history, don't push it again.
-        if (newRoute.inHistory)
+        if (/** @type {HistoricRoute} */(newRoute).inHistory)
           return;
 
         // Mark routes persisted in history as already stored in history.
-        var historicState = {
+        var historicRoute = /** @type {HistoricRoute} */({
           inHistory: true,
           page: newRoute.page,
           section: newRoute.section,
           subpage: newRoute.subpage,
           dialog: newRoute.dialog,
-        };
+        });
 
         // Push the current route to the history state, so when the user
         // navigates with the browser back button, we can recall the route.
         if (oldRoute) {
-          window.history.pushState(historicState, document.title, route.url);
+          window.history.pushState(historicRoute, document.title,
+                                   canonicalRoute.url);
         } else {
           // For the very first route (oldRoute will be undefined), we replace
           // the existing state instead of pushing a new one. This is to allow
           // the user to use the browser back button to exit Settings entirely.
-          window.history.replaceState(historicState, document.title);
+          window.history.replaceState(historicRoute, document.title);
         }
 
         return;