Settings Router Refactor: Support dynamic parameters

chrome/browser/resources/settings/route.js

Index: chrome/browser/resources/settings/route.js
diff --git a/chrome/browser/resources/settings/route.js b/chrome/browser/resources/settings/route.js
index 70b3570064f87252fd36fbd789b157c632940bd3..6319415670a4ca317b5066357c3f2ac19fe8f845 100644
--- a/chrome/browser/resources/settings/route.js
+++ b/chrome/browser/resources/settings/route.js
@@ -292,26 +292,36 @@ cr.define('settings', function() {
   };
 
   /**
-   * The current active route. This may only be updated via the global
-   * function settings.navigateTo.
+   * The current active route. This updated only by settings.navigateTo.
    * @private {!settings.Route}
    */
-  var currentRoute_ = (function() {
-    var route = getRouteForPath(window.location.pathname);
-    if (route)
-      return route;
+  var currentRoute_ = Route.BASIC;
+
+  /**
+   * The current query parameters. This updated only by settings.navigateTo.
+   * @private {!URLSearchParams}
+   */
+  var currentQueryParameters_ = new URLSearchParams();
 
-    // Reset the URL path to '/' if the user navigates to a nonexistent URL.
-    window.history.replaceState(undefined, '', Route.BASIC.path);
-    return Route.BASIC;
+  // Initialize the route and query params from the URL.
+  (function() {
+    var route = getRouteForPath(window.location.pathname);
+    if (route) {
+      currentRoute_ = route;
+      currentQueryParameters_ = new URLSearchParams(window.location.search);
+    } else {
+      window.history.pushState(undefined, '', Route.BASIC.path);
+    }
   })();
 
   /**
    * Helper function to set the current route and notify all observers.
    * @param {!settings.Route} route
+   * @param {!URLSearchParams} queryParameters
    */
-  var setCurrentRoute = function(route) {
+  var setCurrentRoute = function(route, queryParameters) {
     currentRoute_ = route;
+    currentQueryParameters_ = queryParameters;
     for (var observer of routeObservers_)
       observer.currentRouteChanged();
   };
@@ -319,22 +329,34 @@ cr.define('settings', function() {
   /** @return {!settings.Route} */
   var getCurrentRoute = function() { return currentRoute_; };
 
+  /** @return {!URLSearchParams} */
+  var getQueryParameters = function() { return currentQueryParameters_; };
+
   /**
    * Navigates to a canonical route and pushes a new history entry.
    * @param {!settings.Route} route
+   * @param {URLSearchParams=} opt_dynamicParameters
    * @private
    */
-  var navigateTo = function(route) {
-    if (assert(route) == currentRoute_)
+  var navigateTo = function(route, opt_dynamicParameters) {
+    if (assert(route) == currentRoute_ && !opt_dynamicParameters)

[Dan Beam, 2016/08/03 01:30:58]

why are we not comparing the dynamic parameters as well?

[tommycli, 2016/08/03 16:01:39]

Done.

       return;
 
-    window.history.pushState(undefined, '', route.path);
-    setCurrentRoute(route);
+    var url = route.path;
+    if (opt_dynamicParameters) {
+      var queryString = opt_dynamicParameters.toString();
+      if (queryString)
+        url += '?' + queryString;
+    }
+
+    setCurrentRoute(route, opt_dynamicParameters || new URLSearchParams());
+    window.history.pushState(undefined, '', url);
   };
 
   window.addEventListener('popstate', function(event) {
     // On pop state, do not push the state onto the window.history again.
-    setCurrentRoute(getRouteForPath(window.location.pathname) || Route.BASIC);
+    setCurrentRoute(getRouteForPath(window.location.pathname) || Route.BASIC,
+                    new URLSearchParams(window.location.search));
   });
 
   return {
@@ -342,6 +364,7 @@ cr.define('settings', function() {
     RouteObserverBehavior: RouteObserverBehavior,
     getRouteForPath: getRouteForPath,
     getCurrentRoute: getCurrentRoute,
+    getQueryParameters: getQueryParameters,
     navigateTo: navigateTo,
   };
 });