Split OptionsPage into Page and PageManager

chrome/browser/resources/options/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 */ var OptionsPage = options.OptionsPage;
+  /** @const */ var Page = cr.ui.pageManager.Page;
+  /** @const */ var PageManager = cr.ui.pageManager.PageManager;
 
   /**
    * Encapsulated handling of a search bubble.
    * @constructor
    */
   function SearchBubble(text) {
     var el = cr.doc.createElement('div');
     SearchBubble.decorate(el);
     el.content = text;
     return el;
@@ skipping 90 matching lines @@
         this.lastTop = top;
       }
     },
   };
 
   /**
    * Encapsulated handling of the search page.
    * @constructor
    */
   function SearchPage() {
-    OptionsPage.call(this, 'search',
-                     loadTimeData.getString('searchPageTabTitle'),
-                     'searchPage');
+    Page.call(this, 'search',
+              loadTimeData.getString('searchPageTabTitle'),
+              'searchPage');
   }
 
   cr.addSingletonGetter(SearchPage);
 
   SearchPage.prototype = {
-    // Inherit SearchPage from OptionsPage.
-    __proto__: OptionsPage.prototype,
+    // Inherit SearchPage from Page.
+    __proto__: Page.prototype,
 
     /**
      * A boolean to prevent recursion. Used by setSearchText_().
      * @type {boolean}
      * @private
      */
     insideSetSearchText_: false,
 
     /** @override */
     initializePage: function() {
-      // Call base class implementation to start preference initialization.
-      OptionsPage.prototype.initializePage.call(this);
+      Page.prototype.initializePage.call(this);
 
       this.searchField = $('search-field');
 
       // Handle search events. (No need to throttle, WebKit's search field
       // will do that automatically.)
       this.searchField.onsearch = function(e) {
         this.setSearchText_(e.currentTarget.value);
       }.bind(this);
 
       // Install handler for key presses.
@@ skipping 41 matching lines @@
       this.searchActive_ = active;
 
       if (active) {
         var hash = location.hash;
         if (hash) {
           this.searchField.value =
               decodeURIComponent(hash.slice(1).replace(/\+/g, ' '));
         } else if (!this.searchField.value) {
           // This should only happen if the user goes directly to
           // chrome://settings-frame/search
-          OptionsPage.showDefaultPage();
+          PageManager.showDefaultPage();
           return;
         }
 
         // 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);
@@ skipping 14 matching lines @@
           if (active) {
             if (childDiv.tagName != 'SECTION')
               childDiv.classList.add('search-hidden');
           } else {
             childDiv.classList.remove('search-hidden');
           }
         }
 
         if (active) {
           // When search is active, remove the 'hidden' tag.  This tag may have
-          // been added by the OptionsPage.
+          // been added by the PageManager.
           page.pageDiv.hidden = false;
         }
       }
 
       if (active) {
         this.setSearchText_(this.searchField.value);
         this.searchField.focus();
       } else {
         // After hiding all page content, remove any search results.
         this.unhighlightMatches_();
@@ skipping 22 matching lines @@
       text = SearchPage.canonicalizeQuery(text);
 
       // Set the hash on the current page, and the enclosing uber page
       var hash = text ? '#' + encodeURIComponent(text) : '';
       var path = text ? this.name : '';
       uber.pushState({}, path + hash);
 
       // Toggle the search page if necessary.
       if (text) {
         if (!this.searchActive_)
-          OptionsPage.showPageByName(this.name, false);
+          PageManager.showPageByName(this.name, false);
       } else {
         if (this.searchActive_)
-          OptionsPage.showPageByName(OptionsPage.getDefaultPage().name, false);
+          PageManager.showDefaultPage(false);
 
         this.insideSetSearchText_ = false;
         return;
       }
 
       var foundMatches = false;
 
       // Remove any prior search results.
       this.unhighlightMatches_();
       this.removeSearchBubbles_();
@@ skipping 191 matching lines @@
     },
 
     /**
      * Builds a list of top-level pages to search.  Omits the search page and
      * all sub-pages.
      * @return {Array} An array of pages to search.
      * @private
      */
     getSearchablePages_: function() {
       var name, page, pages = [];
-      for (name in OptionsPage.registeredPages) {
+      for (name in PageManager.registeredPages) {
         if (name != this.name) {
-          page = OptionsPage.registeredPages[name];
+          page = PageManager.registeredPages[name];
           if (!page.parentPage)
             pages.push(page);
         }
       }
       return pages;
     },
 
     /**
      * Builds a list of sub-pages (and overlay pages) to search.  Ignore pages
      * that have no associated controls, or whose controls are hidden.
      * @return {Array} An array of pages to search.
      * @private
      */
     getSearchableSubPages_: function() {
       var name, pageInfo, page, pages = [];
-      for (name in OptionsPage.registeredPages) {
-        page = OptionsPage.registeredPages[name];
+      for (name in PageManager.registeredPages) {
+        page = PageManager.registeredPages[name];
         if (page.parentPage &&
             page.associatedSection &&
             !page.associatedSection.hidden) {
           pages.push(page);
         }
       }
-      for (name in OptionsPage.registeredOverlayPages) {
-        page = OptionsPage.registeredOverlayPages[name];
+      for (name in PageManager.registeredOverlayPages) {
+        page = PageManager.registeredOverlayPages[name];
         if (page.associatedSection &&
             !page.associatedSection.hidden &&
             page.pageDiv != undefined) {
           pages.push(page);
         }
       }
       return pages;
     },
 
     /**
@@ skipping 35 matching lines @@
     // Trim beginning and ending whitespace.
     return text.replace(/^\s+|\s+$/g, '');
   };
 
   // Export
   return {
     SearchPage: SearchPage
   };
 
 });