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

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

Issue 2224163002: Settings Router Refactor: Replace route.subpage usage with route.path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years, 4 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/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html"> 5 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html">
6 <link rel="import" href="/controls/settings_checkbox.html"> 6 <link rel="import" href="/controls/settings_checkbox.html">
7 <link rel="import" href="/route.html"> 7 <link rel="import" href="/route.html">
8 <link rel="import" href="/settings_page/settings_animated_pages.html"> 8 <link rel="import" href="/settings_page/settings_animated_pages.html">
9 <link rel="import" href="/settings_page/settings_subpage.html"> 9 <link rel="import" href="/settings_page/settings_subpage.html">
10 <link rel="import" href="/settings_shared_css.html"> 10 <link rel="import" href="/settings_shared_css.html">
(...skipping 13 matching lines...) Expand all
24 24
25 <dom-module id="settings-privacy-page"> 25 <dom-module id="settings-privacy-page">
26 <template> 26 <template>
27 <style include="settings-shared"></style> 27 <style include="settings-shared"></style>
28 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> 28 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp>
29 <settings-clear-browsing-data-dialog prefs="{{prefs}}" 29 <settings-clear-browsing-data-dialog prefs="{{prefs}}"
30 on-close="onDialogClosed_"> 30 on-close="onDialogClosed_">
31 </settings-clear-browsing-data-dialog> 31 </settings-clear-browsing-data-dialog>
32 </template> 32 </template>
33 <settings-animated-pages id="pages" section="privacy"> 33 <settings-animated-pages id="pages" section="privacy">
34 <neon-animatable id="main"> 34 <neon-animatable route-path="default">
35 <div class="settings-box block first"> 35 <div class="settings-box block first">
36 <p class="privacy-explanation"> 36 <p class="privacy-explanation">
37 $i18nRaw{improveBrowsingExperience} 37 $i18nRaw{improveBrowsingExperience}
38 </p> 38 </p>
39 <settings-checkbox 39 <settings-checkbox
40 pref="{{prefs.alternate_error_pages.enabled}}" 40 pref="{{prefs.alternate_error_pages.enabled}}"
41 label="$i18n{linkDoctorPref}"> 41 label="$i18n{linkDoctorPref}">
42 </settings-checkbox> 42 </settings-checkbox>
43 <settings-checkbox 43 <settings-checkbox
44 pref="{{prefs.search.suggest_enabled}}" 44 pref="{{prefs.search.suggest_enabled}}"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 <div>$i18n{siteSettings}</div> 97 <div>$i18n{siteSettings}</div>
98 <div class="secondary">$i18n{siteSettingsDescription}</div> 98 <div class="secondary">$i18n{siteSettingsDescription}</div>
99 </div> 99 </div>
100 <div class="settings-box"> 100 <div class="settings-box">
101 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button"> 101 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button">
102 $i18n{clearBrowsingData} 102 $i18n{clearBrowsingData}
103 </paper-button> 103 </paper-button>
104 </div> 104 </div>
105 </neon-animatable> 105 </neon-animatable>
106 <if expr="use_nss_certs"> 106 <if expr="use_nss_certs">
107 <template is="dom-if" name="manage-certificates"> 107 <template is="dom-if" route-path="/certificates">
108 <settings-subpage 108 <settings-subpage
109 associated-control="[[$$('#manageCertificates')]]" 109 associated-control="[[$$('#manageCertificates')]]"
110 page-title="$i18n{manageCertificates}"> 110 page-title="$i18n{manageCertificates}">
111 <settings-certificate-manager-page> 111 <settings-certificate-manager-page>
112 </settings-certificate-manager-page> 112 </settings-certificate-manager-page>
113 </settings-subpage> 113 </settings-subpage>
114 </template> 114 </template>
115 </if> 115 </if>
116 <template is="dom-if" name="site-settings"> 116 <template is="dom-if" route-path="/siteSettings">
117 <settings-subpage 117 <settings-subpage
118 associated-control="[[$$('#site-settings-subpage-trigger')]]" 118 associated-control="[[$$('#site-settings-subpage-trigger')]]"
119 id="site-settings" 119 id="site-settings"
120 page-title="$i18n{siteSettings}"> 120 page-title="$i18n{siteSettings}">
121 <settings-site-settings-page category-selected="{{categorySelected}}"> 121 <settings-site-settings-page category-selected="{{categorySelected}}">
122 </settings-site-settings-page> 122 </settings-site-settings-page>
123 </settings-subpage> 123 </settings-subpage>
124 </template> 124 </template>
125 125
126 <template is="dom-if" name="all-sites" no-search> 126 <template is="dom-if" route-path="/siteSettings/all" no-search>
127 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}"> 127 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}">
128 <all-sites selected-site="{{selectedSite}}"></all-sites> 128 <all-sites selected-site="{{selectedSite}}"></all-sites>
129 </settings-subpage> 129 </settings-subpage>
130 </template> 130 </template>
131 <template is="dom-if" name="site-settings-category-automatic-downloads" 131 <template is="dom-if" route-path="/siteSettings/automaticDownloads" no-sea rch>
132 no-search> 132 no-search>
133 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}"> 133 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}">
134 <site-settings-category 134 <site-settings-category
135 selected-site="{{selectedSite}}" 135 selected-site="{{selectedSite}}"
136 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> 136 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
137 </site-settings-category> 137 </site-settings-category>
138 </settings-subpage> 138 </settings-subpage>
139 </template> 139 </template>
140 <template is="dom-if" name="site-settings-category-background-sync" 140 <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search>
141 no-search> 141 no-search>
142 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"> 142 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}">
143 <site-settings-category 143 <site-settings-category
144 selected-site="{{selectedSite}}" 144 selected-site="{{selectedSite}}"
145 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> 145 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
146 </site-settings-category> 146 </site-settings-category>
147 </settings-subpage> 147 </settings-subpage>
148 </template> 148 </template>
149 <template is="dom-if" name="site-settings-category-camera" no-search> 149 <template is="dom-if" route-path="/siteSettings/camera" no-search>
150 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> 150 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}">
151 <site-settings-category 151 <site-settings-category
152 selected-site="{{selectedSite}}" 152 selected-site="{{selectedSite}}"
153 category="{{ContentSettingsTypes.CAMERA}}"> 153 category="{{ContentSettingsTypes.CAMERA}}">
154 <media-picker type="camera" class="media-picker"></media-picker> 154 <media-picker type="camera" class="media-picker"></media-picker>
155 </site-settings-category> 155 </site-settings-category>
156 </settings-subpage> 156 </settings-subpage>
157 </template> 157 </template>
158 <template is="dom-if" name="site-settings-category-cookies" no-search> 158 <template is="dom-if" route-path="/siteSettings/cookies" no-search>
159 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> 159 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
160 <site-settings-category 160 <site-settings-category
161 selected-site="{{selectedSite}}" 161 selected-site="{{selectedSite}}"
162 category="{{ContentSettingsTypes.COOKIES}}"> 162 category="{{ContentSettingsTypes.COOKIES}}">
163 <div class="settings-box cookie-controls"> 163 <div class="settings-box cookie-controls">
164 <settings-checkbox class="start" 164 <settings-checkbox class="start"
165 label="$i18n{thirdPartyCookie}" 165 label="$i18n{thirdPartyCookie}"
166 sub-label="$i18n{thirdPartyCookieSublabel}" 166 sub-label="$i18n{thirdPartyCookieSublabel}"
167 pref="{{prefs.profile.block_third_party_cookies}}"> 167 pref="{{prefs.profile.block_third_party_cookies}}">
168 </settings-checkbox> 168 </settings-checkbox>
169 </div> 169 </div>
170 <site-data class="site-data"></site-data> 170 <site-data class="site-data"></site-data>
171 </site-settings-category> 171 </site-settings-category>
172 </settings-subpage> 172 </settings-subpage>
173 </template> 173 </template>
174 <template is="dom-if" name="site-settings-category-images" no-search> 174 <template is="dom-if" route-path="/siteSettings/images" no-search>
175 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}"> 175 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}">
176 <site-settings-category 176 <site-settings-category
177 selected-site="{{selectedSite}}" 177 selected-site="{{selectedSite}}"
178 category="{{ContentSettingsTypes.IMAGES}}"> 178 category="{{ContentSettingsTypes.IMAGES}}">
179 </site-settings-category> 179 </site-settings-category>
180 </settings-subpage> 180 </settings-subpage>
181 </template> 181 </template>
182 <template is="dom-if" name="site-settings-category-location" no-search> 182 <template is="dom-if" route-path="/siteSettings/location" no-search>
183 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}"> 183 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}">
184 <site-settings-category 184 <site-settings-category
185 selected-site="{{selectedSite}}" 185 selected-site="{{selectedSite}}"
186 category="{{ContentSettingsTypes.GEOLOCATION}}"> 186 category="{{ContentSettingsTypes.GEOLOCATION}}">
187 </site-settings-category> 187 </site-settings-category>
188 </settings-subpage> 188 </settings-subpage>
189 </template> 189 </template>
190 <template is="dom-if" name="protocol-handlers" no-search> 190 <template is="dom-if" name="protocol-handlers" no-search>
191 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}"> 191 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}">
192 <protocol-handlers></protocol-handlers> 192 <protocol-handlers></protocol-handlers>
193 </settings-subpage> 193 </settings-subpage>
194 </template> 194 </template>
195 <template is="dom-if" name="site-settings-category-javascript" no-search> 195 <template is="dom-if" route-path="/siteSettings/javascript" no-search>
196 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"> 196 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}">
197 <site-settings-category 197 <site-settings-category
198 selected-site="{{selectedSite}}" 198 selected-site="{{selectedSite}}"
199 category="{{ContentSettingsTypes.JAVASCRIPT}}"> 199 category="{{ContentSettingsTypes.JAVASCRIPT}}">
200 </site-settings-category> 200 </site-settings-category>
201 </settings-subpage> 201 </settings-subpage>
202 </template> 202 </template>
203 <template is="dom-if" name="site-settings-category-keygen" no-search> 203 <template is="dom-if" route-path="/siteSettings/keygen" no-search>
204 <settings-subpage page-title="$i18n{siteSettingsKeygen}"> 204 <settings-subpage page-title="$i18n{siteSettingsKeygen}">
205 <site-settings-category 205 <site-settings-category
206 selected-site="{{selectedSite}}" 206 selected-site="{{selectedSite}}"
207 category="{{ContentSettingsTypes.KEYGEN}}"> 207 category="{{ContentSettingsTypes.KEYGEN}}">
208 </site-settings-category> 208 </site-settings-category>
209 </settings-subpage> 209 </settings-subpage>
210 </template> 210 </template>
211 <template is="dom-if" name="site-settings-category-microphone" no-search> 211 <template is="dom-if" route-path="/siteSettings/microphone" no-search>
212 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> 212 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}">
213 <site-settings-category 213 <site-settings-category
214 selected-site="{{selectedSite}}" 214 selected-site="{{selectedSite}}"
215 category="{{ContentSettingsTypes.MIC}}"> 215 category="{{ContentSettingsTypes.MIC}}">
216 <media-picker type="mic" class="media-picker"></media-picker> 216 <media-picker type="mic" class="media-picker"></media-picker>
217 </site-settings-category> 217 </site-settings-category>
218 </settings-subpage> 218 </settings-subpage>
219 </template> 219 </template>
220 <template is="dom-if" name="site-settings-category-notifications" 220 <template is="dom-if" route-path="/siteSettings/notifications" no-search>
221 no-search>
222 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}"> 221 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}">
223 <site-settings-category 222 <site-settings-category
224 selected-site="{{selectedSite}}" 223 selected-site="{{selectedSite}}"
225 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> 224 category="{{ContentSettingsTypes.NOTIFICATIONS}}">
226 </site-settings-category> 225 </site-settings-category>
227 </settings-subpage> 226 </settings-subpage>
228 </template> 227 </template>
229 <template is="dom-if" name="site-settings-category-plugins" no-search> 228 <template is="dom-if" route-path="/siteSettings/plugins" no-search>
230 <settings-subpage page-title="$i18n{siteSettingsPlugins}"> 229 <settings-subpage page-title="$i18n{siteSettingsPlugins}">
231 <site-settings-category 230 <site-settings-category
232 selected-site="{{selectedSite}}" 231 selected-site="{{selectedSite}}"
233 category="{{ContentSettingsTypes.PLUGINS}}"> 232 category="{{ContentSettingsTypes.PLUGINS}}">
234 </site-settings-category> 233 </site-settings-category>
235 </settings-subpage> 234 </settings-subpage>
236 </template> 235 </template>
237 <template is="dom-if" name="site-settings-category-popups" no-search> 236 <template is="dom-if" route-path="/siteSettings/popups" no-search>
238 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> 237 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
239 <site-settings-category 238 <site-settings-category
240 selected-site="{{selectedSite}}" 239 selected-site="{{selectedSite}}"
241 category="{{ContentSettingsTypes.POPUPS}}"> 240 category="{{ContentSettingsTypes.POPUPS}}">
242 </site-settings-category> 241 </site-settings-category>
243 </settings-subpage> 242 </settings-subpage>
244 </template> 243 </template>
245 <template is="dom-if" name="site-settings-category-unsandboxed-plugins" 244 <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins" no-sea rch>
246 no-search>
247 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> 245 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
248 <site-settings-category 246 <site-settings-category
249 selected-site="{{selectedSite}}" 247 selected-site="{{selectedSite}}"
250 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> 248 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
251 </site-settings-category> 249 </site-settings-category>
252 </settings-subpage> 250 </settings-subpage>
253 </template> 251 </template>
254 252
255 <template is="dom-if" name="site-details" no-search> 253 <template is="dom-if" name="site-details" no-search>
256 <settings-subpage page-title="[[selectedSite.originForDisplay]]"> 254 <settings-subpage page-title="[[selectedSite.originForDisplay]]">
257 <site-details site="[[selectedSite]]"></site-details> 255 <site-details site="[[selectedSite]]"></site-details>
258 </settings-subpage> 256 </settings-subpage>
259 </template> 257 </template>
260 </settings-animated-pages> 258 </settings-animated-pages>
261 </template> 259 </template>
262 <script src="privacy_page.js"></script> 260 <script src="privacy_page.js"></script>
263 </dom-module> 261 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698