| Index: chrome/browser/resources/settings/settings_main/settings_main.js
|
| diff --git a/chrome/browser/resources/settings/settings_main/settings_main.js b/chrome/browser/resources/settings/settings_main/settings_main.js
|
| index 11cd9dd684eebba61b2ff7ec7ffed466e63f3575..7e5f29436c8b2b6ce2bd2762b1c276b113694573 100644
|
| --- a/chrome/browser/resources/settings/settings_main/settings_main.js
|
| +++ b/chrome/browser/resources/settings/settings_main/settings_main.js
|
| @@ -59,6 +59,7 @@ Polymer({
|
| },
|
| },
|
|
|
| + /** @override */
|
| attached: function() {
|
| document.addEventListener('toggle-advanced-page', function(e) {
|
| this.showAdvancedPage_ = e.detail;
|
| @@ -108,4 +109,34 @@ Polymer({
|
| toggleAdvancedPage_: function() {
|
| this.fire('toggle-advanced-page', !this.isAdvancedMenuOpen_);
|
| },
|
| +
|
| + /**
|
| + * Navigates to the default search page (if necessary).
|
| + * @private
|
| + */
|
| + ensureInDefaultSearchPage_: function() {
|
| + if (this.currentRoute.page != 'basic' ||
|
| + this.currentRoute.section != '' ||
|
| + this.currentRoute.subpage.length != 0) {
|
| + this.currentRoute = {page: 'basic', section: '', subpage: [], url: ''};
|
| + }
|
| + },
|
| +
|
| + /**
|
| + * @param {string} query
|
| + */
|
| + searchContents: function(query) {
|
| + this.ensureInDefaultSearchPage_();
|
| +
|
| + // Search basic page immediately.
|
| + settings.search(query, assert(this.$$('settings-basic-page')));
|
| +
|
| + // Force the advanced page to be rendered and search once ready. Even if
|
| + // the advanced page is already rendered, yield to the message loop before
|
| + // initiating searching.
|
| + this.showAdvancedPage_ = true;
|
| + setTimeout(function() {
|
| + settings.search(query, assert(this.$$('settings-advanced-page')));
|
| + }.bind(this), 0);
|
| + },
|
| });
|
|
|