MD Settings: Implement search URLs.

chrome/browser/resources/settings/settings_main/settings_main.js

 // Copyright 2015 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.
 
 /**
  * @typedef {{about: boolean, basic: boolean, advanced: boolean}}
  */
 var MainPageVisibility;
 
 /**
@@ skipping 176 matching lines @@
    * @return {boolean} Whether to show the advanced page, taking into account
    *     both routing and search state.
    * @private
    */
   showAdvancedPage_: function() {
     return this.showPages_.advanced || (
         this.inSearchMode_ && !this.hasExpandedSection_);
   },
 
   /** @param {!settings.Route} newRoute */
-  currentRouteChanged: function(newRoute) {
+  currentRouteChanged: function(newRoute, previousRoute) {
+    // Don't issue any new search requests, if the current page is a subpage or
+    // if user returns to a top-level from a subpage, since the search hits are
+    // already highlighted.
+    if (!newRoute.isSubpage() &&

[dpapad, 2016/10/27 17:39:58]

As I was explaining this logic to Tommy, he found a small bug case. I'll be
fixing it and re-ping the CL. Thanks!

+        (!previousRoute || !previousRoute.isSubpage())) {
+      var searchQuery = settings.getQueryParameters().get('search') || '';
+      if (searchQuery)
+        this.searchContents_(searchQuery);
+      else if (this.inSearchMode_)
+        this.searchContents_('');
+    }
+
     // When the route changes from a sub-page to the main page, immediately
     // update hasExpandedSection_ to unhide the other sections.
     if (!newRoute.isSubpage())
       this.hasExpandedSection_ = false;
 
     if (settings.Route.ADVANCED.contains(newRoute))
       this.advancedToggleExpanded = true;
 
     this.updatePagesShown_();
   },
@@ skipping 98 matching lines @@
           this.$$('settings-advanced-page'));
     }
     if (settings.Route.BASIC.contains(route)) {
       return /** @type {?SettingsBasicPageElement} */(
           this.$$('settings-basic-page'));
     }
     assertNotReached();
   },
 
   /**
-   * Navigates to the default search page (if necessary).
-   * @private
-   */
-  ensureInDefaultSearchPage_: function() {
-    if (settings.getCurrentRoute() != settings.Route.BASIC)
-      settings.navigateTo(settings.Route.BASIC);
-  },
-
-  /**
    * @param {string} query
    * @return {!Promise} A promise indicating that searching finished.
    */
-  searchContents: function(query) {
+  searchContents_: function(query) {
     // Trigger rendering of the basic and advanced pages and search once ready.
     this.inSearchMode_ = true;
-    this.ensureInDefaultSearchPage_();
     this.toolbarSpinnerActive = true;
 
     return new Promise(function(resolve, reject) {
       setTimeout(function() {
         var whenSearchDone = settings.getSearchManager().search(
             query, assert(this.getPage_(settings.Route.BASIC)));
         assert(
             whenSearchDone ===
                 settings.getSearchManager().search(
                     query, assert(this.getPage_(settings.Route.ADVANCED))));
@@ skipping 18 matching lines @@
 
   /**
    * @param {(boolean|undefined)} visibility
    * @return {boolean} True unless visibility is false.
    * @private
    */
   showAdvancedSettings_: function(visibility) {
     return visibility !== false;
   },
 });