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..9af4f454538b0bd92aa4a22eba76ba0a3e09dc08 100644 |
--- a/chrome/browser/resources/settings/settings_main/settings_main.html |
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html |
@@ -38,25 +38,27 @@ |
} |
</style> |
<content select="paper-icon-button"></content> |
- <template is="dom-if" if="[[showBasicPage_]]"> |
- <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> |
- </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="[[!showPages_.ABOUT]]"> |
dschuyler
2016/07/21 02:38:22
Why is about all caps, as if it were a const?
michaelpg
2016/07/21 03:00:28
Hmm, I guess it's not a const (since yeah, it's a
|
+ <template is="dom-if" if="[[showPages_.BASIC]]"> |
+ <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"> |
+ </settings-basic-page> |
+ </template> |
+ <div hidden$="[[inSubpage_]]"> |
+ <div id="toggleSpacer"></div> |
+ <div id="toggleContainer"> |
+ <div id="advancedToggle" on-tap="toggleAdvancedPage_"> |
+ <span>$i18n{advancedPageTitle}</span> |
+ <iron-icon icon="[[arrowState_(showPages_.ADVANCED)]]"></iron-icon> |
+ </div> |
</div> |
</div> |
+ <template is="dom-if" if="[[showPages_.ADVANCED]]"> |
+ <settings-advanced-page prefs="{{prefs}}" |
+ current-route="{{currentRoute}}"> |
+ </settings-advanced-page> |
+ </template> |
</template> |
- <template is="dom-if" if="[[showAdvancedPage_]]"> |
- <settings-advanced-page prefs="{{prefs}}" |
- current-route="{{currentRoute}}"> |
- </settings-advanced-page> |
- </template> |
- <template is="dom-if" if="[[showAboutPage_]]"> |
+ <template is="dom-if" if="[[showPages_.ABOUT]]"> |
<settings-about-page current-route="{{currentRoute}}"> |
</settings-about-page> |
</template> |