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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2518233004: MD Settings: Move settings-advanced-page into settings-basic-page (Closed)
Patch Set: rebase Created 4 years 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
« no previous file with comments | « chrome/browser/resources/settings/advanced_page/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/basic_page/basic_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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="/a11y_page/a11y_page.html">
2 <link rel="import" href="/appearance_page/appearance_page.html"> 3 <link rel="import" href="/appearance_page/appearance_page.html">
4 <link rel="import" href="/downloads_page/downloads_page.html">
5 <link rel="import" href="/languages_page/languages_page.html">
6 <link rel="import" href="/on_startup_page/on_startup_page.html">
7 <link rel="import" href="/passwords_and_forms_page/passwords_and_forms_page.html ">
8 <link rel="import" href="/people_page/people_page.html">
9 <link rel="import" href="/printing_page/printing_page.html">
10 <link rel="import" href="/privacy_page/privacy_page.html">
11 <link rel="import" href="/reset_page/reset_page.html">
12 <link rel="import" href="/reset_page/reset_profile_banner.html">
3 <link rel="import" href="/search_page/search_page.html"> 13 <link rel="import" href="/search_page/search_page.html">
4 <link rel="import" href="/settings_page/main_page_behavior.html"> 14 <link rel="import" href="/settings_page/main_page_behavior.html">
5 <link rel="import" href="/settings_page/settings_page_visibility.html"> 15 <link rel="import" href="/settings_page/settings_page_visibility.html">
6 <link rel="import" href="/settings_page/settings_section.html"> 16 <link rel="import" href="/settings_page/settings_section.html">
7 <link rel="import" href="/on_startup_page/on_startup_page.html">
8 <link rel="import" href="/people_page/people_page.html">
9 <link rel="import" href="/reset_page/reset_profile_banner.html">
10 <link rel="import" href="/settings_page_css.html"> 17 <link rel="import" href="/settings_page_css.html">
18 <link rel="import" href="/settings_vars_css.html">
11 19
12 <if expr="chromeos"> 20 <if expr="chromeos">
13 <link rel="import" href="/android_apps_page/android_apps_page.html"> 21 <link rel="import" href="/android_apps_page/android_apps_page.html">
22 <link rel="import" href="/bluetooth_page/bluetooth_page.html">
23 <link rel="import" href="/date_time_page/date_time_page.html">
14 <link rel="import" href="/device_page/device_page.html"> 24 <link rel="import" href="/device_page/device_page.html">
15 <link rel="import" href="/internet_page/internet_page.html"> 25 <link rel="import" href="/internet_page/internet_page.html">
16 </if> 26 </if>
17 27
18 <if expr="not chromeos"> 28 <if expr="not chromeos">
19 <link rel="import" href="/default_browser_page/default_browser_page.html"> 29 <link rel="import" href="/default_browser_page/default_browser_page.html">
20 </if> 30 <link rel="import" href="/system_page/system_page.html">
21 31 </if>
32
33 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page
34 includes both the basic and advanced settings. -->
22 <dom-module id="settings-basic-page"> 35 <dom-module id="settings-basic-page">
23 <template> 36 <template>
24 <style include="settings-page-styles"></style> 37 <style include="settings-page-styles">
25 <div> 38 #advancedToggle {
26 <template is="dom-if" if="[[showResetProfileBanner_]]"> 39 --paper-button: {
27 <settings-reset-profile-banner on-reset-done="onResetDone_"> 40 text-transform: none;
28 </settings-reset-profile-banner> 41 }
42 @apply(--settings-actionable);
43 align-items: center;
44 display: flex;
45 margin-bottom: 3px;
46 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */
47 min-height: 32px;
48 padding: 0 12px;
49 }
50
51 #toggleContainer {
52 align-items: center;
53 display: flex;
54 font: inherit;
55 justify-content: center;
56 margin-bottom: 0;
57 margin-top: 0;
58 }
59
60 #toggleSpacer {
61 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */
62 }
63
64 iron-icon {
65 -webkit-margin-start: 16px;
66 }
67 </style>
68 <template is="dom-if" if="[[showBasicPage_(
69 currentRoute_, inSearchMode, hasExpandedSection_)]]">
70 <div id="basicPage">
71 <template is="dom-if" if="[[showResetProfileBanner_]]">
72 <settings-reset-profile-banner on-reset-done="onResetDone_">
73 </settings-reset-profile-banner>
74 </template>
75 <if expr="chromeos">
76 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]"
77 restamp>
78 <settings-section page-title="$i18n{internetPageTitle}"
79 section="internet">
80 <settings-internet-page prefs="{{prefs}}">
81 </settings-internet-page>
82 </settings-section>
83 </template>
84 </if>
85 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
86 <settings-section page-title="$i18n{peoplePageTitle}"
87 section="people">
88 <settings-people-page prefs="{{prefs}}"></settings-people-page>
89 </settings-section>
90 </template>
91 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]"
92 restamp>
93 <settings-section page-title="$i18n{appearancePageTitle}"
94 section="appearance">
95 <settings-appearance-page prefs="{{prefs}}"
96 page-visibility="[[pageVisibility.appearance]]">
97 </settings-appearance-page>
98 </settings-section>
99 </template>
100 <if expr="chromeos">
101 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp>
102 <settings-section page-title="$i18n{devicePageTitle}"
103 section="device">
104 <settings-device-page prefs="{{prefs}}"></settings-device-page>
105 </settings-section>
106 </template>
107 </if>
108 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
109 <settings-section page-title="$i18n{searchPageTitle}" section="search" >
110 <settings-search-page prefs="[[prefs]]"></settings-search-page>
111 </settings-section>
112 </template>
113 <if expr="chromeos">
114 <template is="dom-if"
115 if="[[shouldShowAndroidApps_(showAndroidApps, pageVisibility)]]"
116 restamp>
117 <settings-section page-title="$i18n{androidAppsPageTitle}"
118 section="androidApps">
119 <settings-android-apps-page prefs="{{prefs}}">
120 </settings-android-apps-page>
121 </settings-section>
122 </template>
123 </if>
124 <if expr="not chromeos">
125 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
126 restamp>
127 <settings-section page-title="$i18n{defaultBrowser}"
128 section="defaultBrowser">
129 <settings-default-browser-page></settings-default-browser-page>
130 </settings-section>
131 </template>
132 </if>
133 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]"
134 restamp>
135 <settings-section page-title="$i18n{onStartup}" section="onStartup">
136 <settings-on-startup-page prefs="{{prefs}}">
137 </settings-on-startup-page>
138 </settings-section>
139 </template>
140 </div>
141 </template>
142
143 <template is="dom-if"
144 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]">
145 <template is="dom-if" if="[[showAdvancedToggle_(
146 inSearchMode, hasExpandedSection_)]]">
147 <div id="toggleSpacer"></div>
148 <h2 id="toggleContainer">
149 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}"
150 aria-active-attribute="aria-expanded" toggles>
151 <span>$i18n{advancedPageTitle}</span>
152 <iron-icon icon="[[getArrowIcon_(advancedToggleExpanded)]]">
153 </iron-icon>
154 </paper-button>
155 </h2>
29 </template> 156 </template>
30 <if expr="chromeos"> 157
31 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> 158 <template is="dom-if" if="[[showAdvancedPage_(
32 <settings-section page-title="$i18n{internetPageTitle}" 159 currentRoute_, inSearchMode, hasExpandedSection_,
33 section="internet"> 160 advancedToggleExpanded)]]">
34 <settings-internet-page prefs="{{prefs}}"> 161 <div id="advancedPage">
35 </settings-internet-page> 162 <if expr="chromeos">
36 </settings-section> 163 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]"
164 restamp>
165 <settings-section page-title="$i18n{dateTimePageTitle}"
166 section="dateTime">
167 <settings-date-time-page prefs="{{prefs}}"
168 page-visibility="[[pageVisibility.dateTime]]">
169 </settings-date-time-page>
170 </settings-section>
171 </template>
172 </if>
173 <template is="dom-if" if="[[showPage(pageVisibility.privacy)]]"
174 restamp>
175 <settings-section page-title="$i18n{privacyPageTitle}"
176 section="privacy">
177 <settings-privacy-page prefs="{{prefs}}"
178 page-visibility="[[pageVisibility.privacy]]">
179 </settings-privacy-page>
180 </settings-section>
181 </template>
182 <if expr="chromeos">
183 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]"
184 restamp>
185 <settings-section page-title="$i18n{bluetoothPageTitle}"
186 section="bluetooth">
187 <settings-bluetooth-page prefs="{{prefs}}">
188 </settings-bluetooth-page>
189 </settings-section>
190 </template>
191 </if>
192 <template is="dom-if"
193 if="[[showPage(pageVisibility.passwordsAndForms)]]" restamp>
194 <settings-section
195 page-title="$i18n{passwordsAndAutofillPageTitle}"
196 section="passwordsAndForms">
197 <settings-passwords-and-forms-page prefs="{{prefs}}">
198 </settings-passwords-and-forms-page>
199 </settings-section>
200 </template>
201 <template is="dom-if" if="[[showPage(pageVisibility.languages)]]"
202 restamp>
203 <settings-section page-title="$i18n{languagesPageTitle}"
204 section="languages">
205 <settings-languages-page prefs="{{prefs}}">
206 </settings-languages-page>
207 </settings-section>
208 </template>
209 <template is="dom-if" if="[[showPage(pageVisibility.downloads)]]"
210 restamp>
211 <settings-section page-title="$i18n{downloadsPageTitle}"
212 section="downloads">
213 <settings-downloads-page prefs="{{prefs}}"
214 page-visibility="[[pageVisibility.downloads]]">
215 </settings-downloads-page>
216 </settings-section>
217 </template>
218 <template is="dom-if" if="[[showPage(pageVisibility.printing)]]"
219 restamp>
220 <settings-section page-title="$i18n{printingPageTitle}"
221 section="printing">
222 <settings-printing-page prefs="{{prefs}}">
223 </settings-printing-page>
224 </settings-section>
225 </template>
226 <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp>
227 <settings-section page-title="$i18n{a11yPageTitle}" section="a11y">
228 <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page>
229 </settings-section>
230 </template>
231 <if expr="not chromeos">
232 <template is="dom-if" if="[[showPage(pageVisibility.system)]]"
233 restamp>
234 <settings-section page-title="$i18n{systemPageTitle}"
235 section="system">
236 <settings-system-page prefs="{{prefs}}"></settings-system-page>
237 </settings-section>
238 </template>
239 </if>
240 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]"
241 restamp>
242 <settings-section page-title="$i18n{resetPageTitle}"
243 section="reset">
244 <settings-reset-page></settings-reset-page>
245 </settings-section>
246 </template>
247 </div>
37 </template> 248 </template>
38 </if> 249 </template>
39 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
40 <settings-section page-title="$i18n{peoplePageTitle}" section="people">
41 <settings-people-page prefs="{{prefs}}"></settings-people-page>
42 </settings-section>
43 </template>
44 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]"
45 restamp>
46 <settings-section page-title="$i18n{appearancePageTitle}"
47 section="appearance">
48 <settings-appearance-page prefs="{{prefs}}"
49 page-visibility="[[pageVisibility.appearance]]">
50 </settings-appearance-page>
51 </settings-section>
52 </template>
53 <if expr="chromeos">
54 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp>
55 <settings-section page-title="$i18n{devicePageTitle}" section="device">
56 <settings-device-page prefs="{{prefs}}"></settings-device-page>
57 </settings-section>
58 </template>
59 </if>
60 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
61 <settings-section page-title="$i18n{searchPageTitle}" section="search">
62 <settings-search-page prefs="[[prefs]]"></settings-search-page>
63 </settings-section>
64 </template>
65 <if expr="chromeos">
66 <template is="dom-if"
67 if="[[shouldShowAndroidApps_(showAndroidApps, pageVisibility)]]"
68 restamp>
69 <settings-section page-title="$i18n{androidAppsPageTitle}"
70 section="androidApps">
71 <settings-android-apps-page prefs="{{prefs}}">
72 </settings-android-apps-page>
73 </settings-section>
74 </template>
75 </if>
76 <if expr="not chromeos">
77 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
78 restamp>
79 <settings-section page-title="$i18n{defaultBrowser}"
80 section="defaultBrowser">
81 <settings-default-browser-page></settings-default-browser-page>
82 </settings-section>
83 </template>
84 </if>
85 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp>
86 <settings-section page-title="$i18n{onStartup}" section="onStartup">
87 <settings-on-startup-page prefs="{{prefs}}">
88 </settings-on-startup-page>
89 </settings-section>
90 </template>
91 </div>
92 </template> 250 </template>
93 <script src="basic_page.js"></script> 251 <script src="basic_page.js"></script>
94 </dom-module> 252 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/advanced_page/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/basic_page/basic_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698