Chromium Code Reviews| 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 b23930bcc55a02cca9df6a3e898753257a2916a0..29c83acf9b02a016baab955f1d980eeda740ad05 100644 |
| --- a/chrome/browser/resources/settings/settings_main/settings_main.js |
| +++ b/chrome/browser/resources/settings/settings_main/settings_main.js |
| @@ -63,6 +63,13 @@ Polymer({ |
| value: false, |
| notify: true, |
| }, |
| + |
| + /** |
| + * Dictionary defining page visibility. |
| + */ |
| + pageVisibility: { |
| + type: Object, |
| + }, |
| }, |
| /** @override */ |
| @@ -123,6 +130,12 @@ Polymer({ |
| this.showBasicPage_ = this.showAdvancedToggle_ || newRoute.page == 'basic'; |
| + if (newRoute.page == 'advanced') { |
| + var pageVisibility = /** @type {{hideAdvancedSettings: boolean}} */ |
| + (this.pageVisibility); |
| + assert(!pageVisibility.hideAdvancedSettings); |
| + } |
| + |
| this.showAdvancedPage_ = |
| (this.isAdvancedMenuOpen_ && this.showAdvancedToggle_) || |
| newRoute.page == 'advanced'; |
| @@ -151,6 +164,9 @@ Polymer({ |
| * @param {string} query |
| */ |
| searchContents: function(query) { |
| + assert(! /** @type {{hideToolbarSearchField: boolean}} */ |
|
michaelpg
2016/07/21 21:58:44
remove for now?
Moe
2016/07/22 16:59:56
done.
|
| + (this.pageVisibility.hideToolbarSearchField)); |
| + |
| this.ensureInDefaultSearchPage_(); |
| // Trigger rendering of the basic and advanced pages and search once ready. |