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

Side by Side Diff: chrome/browser/resources/settings/basic_page/basic_page.html

Issue 2861443003: MD Settings: Fix subpage visibility and add appearance page tests (Closed)
Patch Set: Rebase Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> 2 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
3 <link rel="import" href="../appearance_page/appearance_page.html"> 3 <link rel="import" href="../appearance_page/appearance_page.html">
4 <link rel="import" href="../controls/settings_idle_load.html"> 4 <link rel="import" href="../controls/settings_idle_load.html">
5 <link rel="import" href="../on_startup_page/on_startup_page.html"> 5 <link rel="import" href="../on_startup_page/on_startup_page.html">
6 <link rel="import" href="../people_page/people_page.html"> 6 <link rel="import" href="../people_page/people_page.html">
7 <link rel="import" href="../reset_page/reset_profile_banner.html"> 7 <link rel="import" href="../reset_page/reset_profile_banner.html">
8 <link rel="import" href="../search_page/search_page.html"> 8 <link rel="import" href="../search_page/search_page.html">
9 <link rel="import" href="../settings_page/main_page_behavior.html"> 9 <link rel="import" href="../settings_page/main_page_behavior.html">
10 <link rel="import" href="../settings_page/settings_section.html"> 10 <link rel="import" href="../settings_page/settings_section.html">
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 <settings-section page-title="$i18n{peoplePageTitle}" 118 <settings-section page-title="$i18n{peoplePageTitle}"
119 section="people"> 119 section="people">
120 <settings-people-page prefs="{{prefs}}"></settings-people-page> 120 <settings-people-page prefs="{{prefs}}"></settings-people-page>
121 </settings-section> 121 </settings-section>
122 </template> 122 </template>
123 <template is="dom-if" if="[[showPage_(pageVisibility.appearance)]]" 123 <template is="dom-if" if="[[showPage_(pageVisibility.appearance)]]"
124 restamp> 124 restamp>
125 <settings-section page-title="$i18n{appearancePageTitle}" 125 <settings-section page-title="$i18n{appearancePageTitle}"
126 section="appearance"> 126 section="appearance">
127 <settings-appearance-page prefs="{{prefs}}" 127 <settings-appearance-page prefs="{{prefs}}"
128 page-visibility="[[getPageVisibility_('appearance')]]"> 128 page-visibility="[[getPageVisibility_(pageVisibility,
dpapad 2017/05/03 23:02:25 IIUC, only the changes in this file are necessary
stevenjb 2017/05/03 23:31:43 Theoretically yes, but I really don't want to aban
129 'appearance')]]">
129 </settings-appearance-page> 130 </settings-appearance-page>
130 </settings-section> 131 </settings-section>
131 </template> 132 </template>
132 <if expr="chromeos"> 133 <if expr="chromeos">
133 <template is="dom-if" if="[[showPage_(pageVisibility.device)]]" restamp> 134 <template is="dom-if" if="[[showPage_(pageVisibility.device)]]" restamp>
134 <settings-section page-title="$i18n{devicePageTitle}" 135 <settings-section page-title="$i18n{devicePageTitle}"
135 section="device"> 136 section="device">
136 <settings-device-page prefs="{{prefs}}"></settings-device-page> 137 <settings-device-page prefs="{{prefs}}"></settings-device-page>
137 </settings-section> 138 </settings-section>
138 </template> 139 </template>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 page-visibility="[[pageVisibility.dateTime]]"> 201 page-visibility="[[pageVisibility.dateTime]]">
201 </settings-date-time-page> 202 </settings-date-time-page>
202 </settings-section> 203 </settings-section>
203 </template> 204 </template>
204 </if> 205 </if>
205 <template is="dom-if" if="[[showPage_(pageVisibility.privacy)]]" 206 <template is="dom-if" if="[[showPage_(pageVisibility.privacy)]]"
206 restamp> 207 restamp>
207 <settings-section page-title="$i18n{privacyPageTitle}" 208 <settings-section page-title="$i18n{privacyPageTitle}"
208 section="privacy"> 209 section="privacy">
209 <settings-privacy-page prefs="{{prefs}}" 210 <settings-privacy-page prefs="{{prefs}}"
210 page-visibility="[[getPageVisibility_('privacy')]]"> 211 page-visibility="[[getPageVisibility_(pageVisibility,
212 'privacy')]]">
211 </settings-privacy-page> 213 </settings-privacy-page>
212 </settings-section> 214 </settings-section>
213 </template> 215 </template>
214 <template is="dom-if" 216 <template is="dom-if"
215 if="[[showPage_(pageVisibility.passwordsAndForms)]]" restamp> 217 if="[[showPage_(pageVisibility.passwordsAndForms)]]" restamp>
216 <settings-section 218 <settings-section
217 page-title="$i18n{passwordsAndAutofillPageTitle}" 219 page-title="$i18n{passwordsAndAutofillPageTitle}"
218 section="passwordsAndForms"> 220 section="passwordsAndForms">
219 <settings-passwords-and-forms-page prefs="{{prefs}}"> 221 <settings-passwords-and-forms-page prefs="{{prefs}}">
220 </settings-passwords-and-forms-page> 222 </settings-passwords-and-forms-page>
221 </settings-section> 223 </settings-section>
222 </template> 224 </template>
223 <template is="dom-if" if="[[showPage_(pageVisibility.languages)]]" 225 <template is="dom-if" if="[[showPage_(pageVisibility.languages)]]"
224 restamp> 226 restamp>
225 <settings-section page-title="$i18n{languagesPageTitle}" 227 <settings-section page-title="$i18n{languagesPageTitle}"
226 section="languages"> 228 section="languages">
227 <settings-languages-page prefs="{{prefs}}"> 229 <settings-languages-page prefs="{{prefs}}">
228 </settings-languages-page> 230 </settings-languages-page>
229 </settings-section> 231 </settings-section>
230 </template> 232 </template>
231 <template is="dom-if" if="[[showPage_(pageVisibility.downloads)]]" 233 <template is="dom-if" if="[[showPage_(pageVisibility.downloads)]]"
232 restamp> 234 restamp>
233 <settings-section page-title="$i18n{downloadsPageTitle}" 235 <settings-section page-title="$i18n{downloadsPageTitle}"
234 section="downloads"> 236 section="downloads">
235 <settings-downloads-page prefs="{{prefs}}" 237 <settings-downloads-page prefs="{{prefs}}"
236 page-visibility="[[getPageVisibility_('downloads')]]"> 238 page-visibility="[[getPageVisibility_(pageVisibility,
239 'downloads')]]">
237 </settings-downloads-page> 240 </settings-downloads-page>
238 </settings-section> 241 </settings-section>
239 </template> 242 </template>
240 <template is="dom-if" if="[[showPage_(pageVisibility.printing)]]" 243 <template is="dom-if" if="[[showPage_(pageVisibility.printing)]]"
241 restamp> 244 restamp>
242 <settings-section page-title="$i18n{printingPageTitle}" 245 <settings-section page-title="$i18n{printingPageTitle}"
243 section="printing"> 246 section="printing">
244 <settings-printing-page prefs="{{prefs}}"> 247 <settings-printing-page prefs="{{prefs}}">
245 </settings-printing-page> 248 </settings-printing-page>
246 </settings-section> 249 </settings-section>
(...skipping 18 matching lines...) Expand all
265 section="reset"> 268 section="reset">
266 <settings-reset-page></settings-reset-page> 269 <settings-reset-page></settings-reset-page>
267 </settings-section> 270 </settings-section>
268 </template> 271 </template>
269 </div> 272 </div>
270 </template> 273 </template>
271 </template> 274 </template>
272 </template> 275 </template>
273 <script src="basic_page.js"></script> 276 <script src="basic_page.js"></script>
274 </dom-module> 277 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698