Index: chrome/browser/resources/settings/settings_main/settings_main.html |
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html |
index 990c85c6c2e61ce39e1eca9a1468443339875ca0..423dbafdc964ffd38fc03ef8ebdbbeb23dd4edb1 100644 |
--- a/chrome/browser/resources/settings/settings_main/settings_main.html |
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html |
@@ -39,22 +39,26 @@ |
</style> |
<content select="paper-icon-button"></content> |
<template is="dom-if" if="[[showBasicPage_]]"> |
- <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> |
+ <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}" |
+ page-visibility="[[pageVisibility]]"> |
</settings-basic-page> |
</template> |
- <template is="dom-if" if="[[showAdvancedToggle_]]"> |
- <div id="toggleSpacer"></div> |
- <div id="toggleContainer"> |
- <div id="advancedToggle" on-tap="toggleAdvancedPage_"> |
- <span>$i18n{advancedPageTitle}</span> |
- <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon> |
+ <template is="dom-if" |
+ if="[[showAdvancedSettings(pageVisibility.advancedSettings)]]"> |
dpapad
2016/07/22 22:40:48
IIUC, showAdvancedSettings() is only used to conve
Moe
2016/07/24 23:54:26
michaelpg@ suggested that we leave pageVisibility
|
+ <template is="dom-if" if="[[showAdvancedToggle_]]"> |
+ <div id="toggleSpacer"></div> |
+ <div id="toggleContainer"> |
+ <div id="advancedToggle" on-tap="toggleAdvancedPage_"> |
+ <span>$i18n{advancedPageTitle}</span> |
+ <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon> |
+ </div> |
</div> |
- </div> |
- </template> |
- <template is="dom-if" if="[[showAdvancedPage_]]"> |
- <settings-advanced-page prefs="{{prefs}}" |
- current-route="{{currentRoute}}"> |
- </settings-advanced-page> |
+ </template> |
+ <template is="dom-if" if="[[showAdvancedPage_]]"> |
+ <settings-advanced-page prefs="{{prefs}}" current-route="{{currentRoute}}" |
+ page-visibility="[[pageVisibility]]"> |
+ </settings-advanced-page> |
+ </template> |
</template> |
<template is="dom-if" if="[[showAboutPage_]]"> |
<settings-about-page current-route="{{currentRoute}}"> |