[uber page] Merge advanced options page into browser options.

chrome/browser/resources/options2/search_page.js

 // Copyright (c) 2012 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('options', function() {
   const OptionsPage = options.OptionsPage;
 
   /**
    * Encapsulated handling of a search bubble.
    * @constructor
@@ skipping 197 matching lines @@
       // activate it now.
       if (!this.searchActive_ && !active)
         return;
 
       this.searchActive_ = active;
 
       if (active) {
         var hash = location.hash;
         if (hash)
           this.searchField.value = unescape(hash.slice(1));
+
+        // Move 'advanced' sections into the main settings page to allow
+        // searching.
+        if (!this.advancedSections_) {
+          this.advancedSections_ =
+              $('advanced-settings-container').querySelectorAll('section');
+          for (var i = 0, section; section = this.advancedSections_[i]; i++)
+            $('settings').appendChild(section);
+        }
       } else {
         // Just wipe out any active search text since it's no longer relevant.
         this.searchField.value = '';
       }
 
       var pagesToSearch = this.getSearchablePages_();
       for (var key in pagesToSearch) {
         var page = pagesToSearch[key];
 
         if (!active)
@@ skipping 21 matching lines @@
       if (active) {
         this.setSearchText_(this.searchField.value);
         $('search-page-search-field-container').appendChild(this.searchField);
         this.searchField.focus();
       } else {
         $('browser-options-search-field-container').appendChild(
             this.searchField);
         // After hiding all page content, remove any search results.
         this.unhighlightMatches_();
         this.removeSearchBubbles_();
+
+        // Move 'advanced' sections back into their original container.
+        if (this.advancedSections_) {
+          for (var i = 0, section; section = this.advancedSections_[i]; i++)
+            $('advanced-settings-container').appendChild(section);
+          this.advancedSections_ = null;
+        }
       }
     },
 
     /**
      * Set the current search criteria.
      * @param {string} text Search text.
      * @private
      */
     setSearchText_: function(text) {
       // Prevent recursive execution of this method.
       if (this.insideSetSearchText_) return;
       this.insideSetSearchText_ = true;
 
       // Cleanup the search query string.
       text = SearchPage.canonicalizeQuery(text);
 
-      // Notify listeners about the new search query, some pages may wish to
-      // show/hide elements based on the query.
-      var event = new cr.Event('searchChanged');
-      event.searchText = text;
-      this.dispatchEvent(event);
-
       // Toggle the search page if necessary.
       if (text.length) {
         if (!this.searchActive_)
           OptionsPage.navigateToPage(this.name);
       } else {
         if (this.searchActive_)
           OptionsPage.showDefaultPage();
 
         this.insideSetSearchText_ = false;
         return;
@@ skipping 280 matching lines @@
     // Trim beginning and ending whitespace.
     return text.replace(/^\s+|\s+$/g, '');
   };
 
   // Export
   return {
     SearchPage: SearchPage
   };
 
 });