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

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

Issue 1779423002: [MD settings] reorder and update settings sections (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: line wrap Created 4 years, 9 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
3 <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.ht ml"> 3 <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.ht ml">
4 <link rel="import" href="chrome://md-settings/search_page/search_page.html"> 4 <link rel="import" href="chrome://md-settings/search_page/search_page.html">
5 <link rel="import" href="chrome://md-settings/settings_page/settings_page_visibi lity.html"> 5 <link rel="import" href="chrome://md-settings/settings_page/settings_page_visibi lity.html">
6 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l"> 6 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l">
7 <link rel="import" href="chrome://md-settings/on_startup_page/on_startup_page.ht ml"> 7 <link rel="import" href="chrome://md-settings/on_startup_page/on_startup_page.ht ml">
8 <link rel="import" href="chrome://md-settings/people_page/people_page.html"> 8 <link rel="import" href="chrome://md-settings/people_page/people_page.html">
9 <link rel="import" href="chrome://md-settings/reset_page/reset_profile_banner.ht ml"> 9 <link rel="import" href="chrome://md-settings/reset_page/reset_profile_banner.ht ml">
10 10
11 <if expr="chromeos"> 11 <if expr="chromeos">
12 <link rel="import" href="chrome://md-settings/device_page/device_page.html"> 12 <link rel="import" href="chrome://md-settings/device_page/device_page.html">
13 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> 13 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
14 </if> 14 </if>
15 15
16 <if expr="not chromeos"> 16 <if expr="not chromeos">
17 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows er_page.html"> 17 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows er_page.html">
18 </if> 18 </if>
19 19
20 <dom-module id="settings-basic-page"> 20 <dom-module id="settings-basic-page">
21 <link rel="import" type="css" href="chrome://md-settings/settings_page.css"> 21 <link rel="import" type="css" href="chrome://md-settings/settings_page.css">
22 <template> 22 <template>
23 <template is="dom-if" if="[[showResetProfileBanner_]]"> 23 <template is="dom-if" if="[[showResetProfileBanner_]]">
24 <settings-reset-profile-banner on-reset-done="onResetDone_"> 24 <settings-reset-profile-banner on-reset-done="onResetDone_">
25 </settings-reset-profile-banner> 25 </settings-reset-profile-banner>
26 </template> 26 </template>
27 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
28 <settings-section page-title="[[i18n('peoplePageTitle')]]"
29 current-route="[[currentRoute]]" section="people">
30 <settings-people-page prefs="{{prefs}}" current-route="{{currentRoute}}" >
31 </settings-people-page>
32 </settings-section>
33 </template>
34 <if expr="chromeos"> 27 <if expr="chromeos">
35 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> 28 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp>
36 <settings-section page-title="[[i18n('internetPageTitle')]]" 29 <settings-section page-title="[[i18n('internetPageTitle')]]"
37 current-route="[[currentRoute]]" section="internet"> 30 current-route="[[currentRoute]]" section="internet">
38 <settings-internet-page current-route="{{currentRoute}}"> 31 <settings-internet-page current-route="{{currentRoute}}">
39 </settings-internet-page> 32 </settings-internet-page>
40 </settings-section> 33 </settings-section>
41 </template> 34 </template>
42 </if> 35 </if>
36 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
dpapad 2016/03/11 02:07:23 Indentation off by 1 here?
dschuyler 2016/03/11 02:28:09 Done.
37 <settings-section page-title="[[i18n('peoplePageTitle')]]"
38 current-route="[[currentRoute]]" section="people">
39 <settings-people-page prefs="{{prefs}}"
40 current-route="{{currentRoute}}">
41 </settings-people-page>
42 </settings-section>
43 </template>
44 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp>
45 <settings-section page-title="[[i18n('onStartup')]]"
46 current-route="[[currentRoute]]" section="onStartup">
47 <settings-on-startup-page prefs="{{prefs}}"
48 current-route="{{currentRoute}}">
49 </settings-on-startup-page>
50 </settings-section>
51 </template>
43 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" restamp> 52 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" restamp>
44 <settings-section page-title="[[i18n('appearancePageTitle')]]" 53 <settings-section page-title="[[i18n('appearancePageTitle')]]"
45 current-route="[[currentRoute]]" section="appearance"> 54 current-route="[[currentRoute]]" section="appearance">
46 <settings-appearance-page prefs="{{prefs}}" 55 <settings-appearance-page prefs="{{prefs}}"
47 current-route="[[currentRoute]]"> 56 current-route="[[currentRoute]]">
48 </settings-appearance-page> 57 </settings-appearance-page>
49 </settings-section> 58 </settings-section>
50 </template> 59 </template>
51 <if expr="chromeos"> 60 <if expr="chromeos">
52 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> 61 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp>
53 <settings-section page-title="[[i18n('devicePageTitle')]]" 62 <settings-section page-title="[[i18n('devicePageTitle')]]"
54 current-route="[[currentRoute]]" section="device"> 63 current-route="[[currentRoute]]" section="device">
55 <settings-device-page prefs="{{prefs}}" 64 <settings-device-page prefs="{{prefs}}"
56 current-route="{{currentRoute}}"> 65 current-route="{{currentRoute}}">
57 </settings-device-page> 66 </settings-device-page>
58 </settings-section> 67 </settings-section>
59 </template> 68 </template>
60 </if> 69 </if>
61 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp>
62 <settings-section page-title="[[i18n('onStartup')]]"
63 current-route="[[currentRoute]]" section="onStartup">
64 <settings-on-startup-page prefs="{{prefs}}"
65 current-route="{{currentRoute}}">
66 </settings-on-startup-page>
67 </settings-section>
68 </template>
69 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> 70 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
70 <settings-section page-title="[[i18n('searchPageTitle')]]" 71 <settings-section page-title="[[i18n('searchPageTitle')]]"
71 current-route="[[currentRoute]]" section="search"> 72 current-route="[[currentRoute]]" section="search">
72 <settings-search-page current-route="{{currentRoute}}"> 73 <settings-search-page current-route="{{currentRoute}}">
73 </settings-search-page> 74 </settings-search-page>
74 </settings-section> 75 </settings-section>
75 </template> 76 </template>
76 <if expr="not chromeos"> 77 <if expr="not chromeos">
77 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" 78 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
78 restamp> 79 restamp>
79 <settings-section page-title="[[i18n('defaultBrowser')]]" 80 <settings-section page-title="[[i18n('defaultBrowser')]]"
80 expand-container="{{expandContainer}}" 81 expand-container="{{expandContainer}}"
81 current-route="[[currentRoute]]" section="defaultBrowser"> 82 current-route="[[currentRoute]]" section="defaultBrowser">
82 <settings-default-browser-page> 83 <settings-default-browser-page>
83 </settings-default-browser-page> 84 </settings-default-browser-page>
84 </settings-section> 85 </settings-section>
85 </template> 86 </template>
86 </if> 87 </if>
87 </template> 88 </template>
88 <script src="basic_page.js"></script> 89 <script src="basic_page.js"></script>
89 </dom-module> 90 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698