Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4343)

Unified Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 2160713002: MD Settings: refactor some main page properties, fix Advanced toggle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: object Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698