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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/content_settings.html

Issue 572853007: reland ce80b519af00bb6259e8c63f91fee5263d818124 with fix for failed test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge conflict again Created 6 years, 3 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
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/resources/options/controlled_setting.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="content-settings-page" class="page" hidden> 1 <div id="content-settings-page" class="page" hidden>
2 <div class="close-button"></div> 2 <div class="close-button"></div>
3 <h1 i18n-content="contentSettingsPage"></h1> 3 <h1 i18n-content="contentSettingsPage"></h1>
4 <div class="content-area"> 4 <div class="content-area">
5 <!-- Cookie filter tab contents --> 5 <!-- Cookie filter tab contents -->
6 <section> 6 <section>
7 <h3 i18n-content="cookiesTabLabel"></h3> 7 <h3 i18n-content="cookiesTabLabel"></h3>
8 <div class="replace-with-website-settings"> 8 <div class="replace-with-website-settings">
9 <div class="radio controlled-setting-with-label"> 9 <div class="radio controlled-setting-with-label">
10 <label> 10 <label>
11 <input type="radio" name="cookies" value="allow"> 11 <input type="radio" name="cookies" value="allow">
12 <span i18n-content="cookiesAllow"></span> 12 <span>
13 <span i18n-content="cookiesAllow"></span>
14 <span class="controlled-setting-indicator"
15 content-setting="cookies" value="allow"></span>
16 </span>
13 </label> 17 </label>
14 <span class="controlled-setting-indicator"
15 content-setting="cookies" value="allow"></span>
16 </div> 18 </div>
17 <div class="radio controlled-setting-with-label"> 19 <div class="radio controlled-setting-with-label">
18 <label> 20 <label>
19 <input type="radio" name="cookies" value="session"> 21 <input type="radio" name="cookies" value="session">
20 <span i18n-content="cookies_session_only"></span> 22 <span>
23 <span i18n-content="cookies_session_only"></span>
24 <span class="controlled-setting-indicator"
25 content-setting="cookies" value="session"></span>
26 </span>
21 </label> 27 </label>
22 <span class="controlled-setting-indicator"
23 content-setting="cookies" value="session"></span>
24 </div> 28 </div>
25 <div class="radio controlled-setting-with-label"> 29 <div class="radio controlled-setting-with-label">
26 <label> 30 <label>
27 <input type="radio" name="cookies" value="block"> 31 <input type="radio" name="cookies" value="block">
28 <span i18n-content="cookiesBlock"></span> 32 <span>
33 <span i18n-content="cookiesBlock"></span>
34 <span class="controlled-setting-indicator"
35 content-setting="cookies" value="block"></span>
36 </span>
29 </label> 37 </label>
30 <span class="controlled-setting-indicator"
31 content-setting="cookies" value="block"></span>
32 </div> 38 </div>
33 <div class="checkbox controlled-setting-with-label"> 39 <div class="checkbox controlled-setting-with-label">
34 <label> 40 <label>
35 <input pref="profile.block_third_party_cookies" type="checkbox"> 41 <input pref="profile.block_third_party_cookies" type="checkbox">
36 <span i18n-content="cookies_block_3rd_party"></span> 42 <span>
43 <span i18n-content="cookies_block_3rd_party"></span>
44 <span class="controlled-setting-indicator"
45 pref="profile.block_third_party_cookies"></span>
37 </label> 46 </label>
38 <span class="controlled-setting-indicator"
39 pref="profile.block_third_party_cookies">
40 </span>
41 </div> 47 </div>
42 <!-- TODO(jochen): remove the div with the clear cookies on exit option 48 <!-- TODO(jochen): remove the div with the clear cookies on exit option
43 once this has shipped. --> 49 once this has shipped. -->
44 <div class="checkbox" guest-visibility="disabled" hidden> 50 <div class="checkbox" guest-visibility="disabled" hidden>
45 <label> 51 <label>
46 <input id="clear-cookies-on-exit" 52 <input id="clear-cookies-on-exit"
47 pref="profile.clear_site_data_on_exit" type="checkbox"> 53 pref="profile.clear_site_data_on_exit" type="checkbox">
48 <span i18n-content="cookies_lso_clear_when_close" 54 <span i18n-content="cookies_lso_clear_when_close"
49 class="clear-plugin-lso-data-enabled"></span> 55 class="clear-plugin-lso-data-enabled"></span>
50 <span i18n-content="cookies_clear_when_close" 56 <span i18n-content="cookies_clear_when_close"
(...skipping 18 matching lines...) Expand all
69 </div> 75 </div>
70 </section> 76 </section>
71 <!-- Image filter --> 77 <!-- Image filter -->
72 <section> 78 <section>
73 <h3 i18n-content="imagesTabLabel"></h3> 79 <h3 i18n-content="imagesTabLabel"></h3>
74 <div class="replace-with-website-settings"> 80 <div class="replace-with-website-settings">
75 <div class="radio controlled-setting-with-label"> 81 <div class="radio controlled-setting-with-label">
76 <label> 82 <label>
77 <input type="radio" name="images" value="allow"> 83 <input type="radio" name="images" value="allow">
78 <span i18n-content="imagesAllow"></span> 84 <span i18n-content="imagesAllow"></span>
85 <span class="controlled-setting-indicator"
86 content-setting="images" value="allow"></span>
79 </label> 87 </label>
80 <span class="controlled-setting-indicator"
81 content-setting="images" value="allow"></span>
82 </div> 88 </div>
83 <div class="radio controlled-setting-with-label"> 89 <div class="radio controlled-setting-with-label">
84 <label> 90 <label>
85 <input type="radio" name="images" value="block"> 91 <input type="radio" name="images" value="block">
86 <span i18n-content="imagesBlock"></span> 92 <span>
93 <span i18n-content="imagesBlock"></span>
94 <span class="controlled-setting-indicator"
95 content-setting="images" value="block"></span>
96 </span>
87 </label> 97 </label>
88 <span class="controlled-setting-indicator"
89 content-setting="images" value="block">
90 </span>
91 </div> 98 </div>
92 <div class="settings-row"> 99 <div class="settings-row">
93 <button class="exceptions-list-button" contentType="images" 100 <button class="exceptions-list-button" contentType="images"
94 i18n-content="manageExceptions"></button> 101 i18n-content="manageExceptions"></button>
95 </div> 102 </div>
96 </div> 103 </div>
97 <div class="experimental-website-settings" hidden> 104 <div class="experimental-website-settings" hidden>
98 <span id="images-default-string"></span> 105 <span id="images-default-string"></span>
99 <div class="settings-row"> 106 <div class="settings-row">
100 <button class="website-settings-permission-button" 107 <button class="website-settings-permission-button"
101 contentType="images" i18n-content="websitesManage"></button> 108 contentType="images" i18n-content="websitesManage"></button>
102 </div> 109 </div>
103 </div> 110 </div>
104 </section> 111 </section>
105 <!-- JavaScript filter --> 112 <!-- JavaScript filter -->
106 <section> 113 <section>
107 <h3 i18n-content="javascriptTabLabel"></h3> 114 <h3 i18n-content="javascriptTabLabel"></h3>
108 <div class="replace-with-website-settings"> 115 <div class="replace-with-website-settings">
109 <div class="radio controlled-setting-with-label"> 116 <div class="radio controlled-setting-with-label">
110 <label> 117 <label>
111 <input type="radio" name="javascript" value="allow"> 118 <input type="radio" name="javascript" value="allow">
112 <span i18n-content="javascriptAllow"></span> 119 <span>
120 <span i18n-content="javascriptAllow"></span>
121 <span class="controlled-setting-indicator"
122 content-setting="javascript" value="allow"></span>
123 </span>
113 </label> 124 </label>
114 <span class="controlled-setting-indicator"
115 content-setting="javascript" value="allow"></span>
116 </div> 125 </div>
117 <div class="radio controlled-setting-with-label"> 126 <div class="radio controlled-setting-with-label">
118 <label> 127 <label>
119 <input type="radio" name="javascript" value="block"> 128 <input type="radio" name="javascript" value="block">
120 <span i18n-content="javascriptBlock"></span> 129 <span>
130 <span i18n-content="javascriptBlock"></span>
131 <span class="controlled-setting-indicator"
132 content-setting="javascript" value="block"></span>
133 </span>
121 </label> 134 </label>
122 <span class="controlled-setting-indicator"
123 content-setting="javascript" value="block"></span>
124 </div> 135 </div>
125 <div class="settings-row"> 136 <div class="settings-row">
126 <button class="exceptions-list-button" contentType="javascript" 137 <button class="exceptions-list-button" contentType="javascript"
127 i18n-content="manageExceptions"></button> 138 i18n-content="manageExceptions"></button>
128 </div> 139 </div>
129 </div> 140 </div>
130 <div class="experimental-website-settings" hidden> 141 <div class="experimental-website-settings" hidden>
131 <span id="javascript-default-string"></span> 142 <span id="javascript-default-string"></span>
132 <div class="settings-row"> 143 <div class="settings-row">
133 <button class="website-settings-permission-button" 144 <button class="website-settings-permission-button"
(...skipping 25 matching lines...) Expand all
159 </div> 170 </div>
160 </div> 171 </div>
161 </section> 172 </section>
162 <!-- Plug-ins filter --> 173 <!-- Plug-ins filter -->
163 <section> 174 <section>
164 <h3 i18n-content="pluginsTabLabel"></h3> 175 <h3 i18n-content="pluginsTabLabel"></h3>
165 <div class="replace-with-website-settings"> 176 <div class="replace-with-website-settings">
166 <div class="radio controlled-setting-with-label"> 177 <div class="radio controlled-setting-with-label">
167 <label> 178 <label>
168 <input type="radio" name="plugins" value="allow"> 179 <input type="radio" name="plugins" value="allow">
169 <span i18n-content="pluginsAllow"></span> 180 <span>
181 <span i18n-content="pluginsAllow"></span>
182 <span class="controlled-setting-indicator"
183 content-setting="plugins" value="allow"></span>
184 </span>
170 </label> 185 </label>
171 <span class="controlled-setting-indicator"
172 content-setting="plugins" value="allow"></span>
173 </div> 186 </div>
174 <div id="click_to_play" class="radio controlled-setting-with-label"> 187 <div id="click_to_play" class="radio controlled-setting-with-label">
175 <label> 188 <label>
176 <input type="radio" name="plugins" value="ask"> 189 <input type="radio" name="plugins" value="ask">
177 <span i18n-content="pluginsAsk"></span> 190 <span>
191 <span i18n-content="pluginsAsk"></span>
192 <span class="controlled-setting-indicator"
193 content-setting="plugins" value="ask"></span>
194 </span>
178 </label> 195 </label>
179 <span class="controlled-setting-indicator"
180 content-setting="plugins" value="ask"></span>
181 </div> 196 </div>
182 <div class="radio controlled-setting-with-label"> 197 <div class="radio controlled-setting-with-label">
183 <label> 198 <label>
184 <input type="radio" name="plugins" value="block"> 199 <input type="radio" name="plugins" value="block">
185 <span i18n-content="pluginsBlock"></span> 200 <span>
201 <span i18n-content="pluginsBlock"></span>
202 <span class="controlled-setting-indicator"
203 content-setting="plugins" value="block"></span>
204 </span>
186 </label> 205 </label>
187 <span class="controlled-setting-indicator"
188 content-setting="plugins" value="block"></span>
189 </div> 206 </div>
190 <div class="settings-row"> 207 <div class="settings-row">
191 <button class="exceptions-list-button" contentType="plugins" 208 <button class="exceptions-list-button" contentType="plugins"
192 i18n-content="manageExceptions"></button> 209 i18n-content="manageExceptions"></button>
193 </div> 210 </div>
194 <div id="disable-plugins-container"> 211 <div id="disable-plugins-container">
195 <a href="chrome://plugins" i18n-content="disableIndividualPlugins" 212 <a href="chrome://plugins" i18n-content="disableIndividualPlugins"
196 target="_blank"></a> 213 target="_blank"></a>
197 </div> 214 </div>
198 </div> 215 </div>
199 <div class="experimental-website-settings" hidden> 216 <div class="experimental-website-settings" hidden>
200 <span id="plugins-default-string"></span> 217 <span id="plugins-default-string"></span>
201 <div class="settings-row"> 218 <div class="settings-row">
202 <button class="website-settings-permission-button" 219 <button class="website-settings-permission-button"
203 contentType="plugins" i18n-content="websitesManage"></button> 220 contentType="plugins" i18n-content="websitesManage"></button>
204 </div> 221 </div>
205 </div> 222 </div>
206 </section> 223 </section>
207 <!-- Pop-ups filter --> 224 <!-- Pop-ups filter -->
208 <section> 225 <section>
209 <h3 i18n-content="popupsTabLabel" class="content-settings-header"></h3> 226 <h3 i18n-content="popupsTabLabel" class="content-settings-header"></h3>
210 <div class="replace-with-website-settings"> 227 <div class="replace-with-website-settings">
211 <div class="radio controlled-setting-with-label"> 228 <div class="radio controlled-setting-with-label">
212 <label> 229 <label>
213 <input type="radio" name="popups" value="allow"> 230 <input type="radio" name="popups" value="allow">
214 <span i18n-content="popupsAllow"></span> 231 <span>
232 <span i18n-content="popupsAllow"></span>
233 <span class="controlled-setting-indicator"
234 content-setting="popups" value="allow"></span>
235 </span>
215 </label> 236 </label>
216 <span class="controlled-setting-indicator"
217 content-setting="popups" value="allow"></span>
218 </div> 237 </div>
219 <div class="radio controlled-setting-with-label"> 238 <div class="radio controlled-setting-with-label">
220 <label> 239 <label>
221 <input type="radio" name="popups" value="block"> 240 <input type="radio" name="popups" value="block">
222 <span i18n-content="popupsBlock"></span> 241 <span>
242 <span i18n-content="popupsBlock"></span>
243 <span class="controlled-setting-indicator"
244 content-setting="popups" value="block"></span>
245 </span>
223 </label> 246 </label>
224 <span class="controlled-setting-indicator"
225 content-setting="popups" value="block"></span>
226 </div> 247 </div>
227 <div class="settings-row"> 248 <div class="settings-row">
228 <button class="exceptions-list-button" contentType="popups" 249 <button class="exceptions-list-button" contentType="popups"
229 i18n-content="manageExceptions"></button> 250 i18n-content="manageExceptions"></button>
230 </div> 251 </div>
231 </div> 252 </div>
232 <div class="experimental-website-settings" hidden> 253 <div class="experimental-website-settings" hidden>
233 <span id="popups-default-string"></span> 254 <span id="popups-default-string"></span>
234 <div class="settings-row"> 255 <div class="settings-row">
235 <button class="website-settings-permission-button" 256 <button class="website-settings-permission-button"
236 contentType="popups" i18n-content="websitesManage"></button> 257 contentType="popups" i18n-content="websitesManage"></button>
237 </div> 258 </div>
238 </div> 259 </div>
239 </section> 260 </section>
240 <!-- Location filter --> 261 <!-- Location filter -->
241 <section> 262 <section>
242 <h3 i18n-content="locationTabLabel"></h3> 263 <h3 i18n-content="locationTabLabel"></h3>
243 <div class="replace-with-website-settings"> 264 <div class="replace-with-website-settings">
244 <div class="radio controlled-setting-with-label"> 265 <div class="radio controlled-setting-with-label">
245 <label> 266 <label>
246 <input type="radio" name="location" value="allow"> 267 <input type="radio" name="location" value="allow">
247 <span i18n-content="locationAllow"></span> 268 <span>
269 <span i18n-content="locationAllow"></span>
270 <span class="controlled-setting-indicator"
271 content-setting="location" value="allow"></span>
272 </span>
248 </label> 273 </label>
249 <span class="controlled-setting-indicator"
250 content-setting="location" value="allow"></span>
251 </div> 274 </div>
252 <div class="radio controlled-setting-with-label"> 275 <div class="radio controlled-setting-with-label">
253 <label> 276 <label>
254 <input type="radio" name="location" value="ask"> 277 <input type="radio" name="location" value="ask">
255 <span i18n-content="locationAsk"></span> 278 <span>
279 <span i18n-content="locationAsk"></span>
280 <span class="controlled-setting-indicator"
281 content-setting="location" value="ask"></span>
282 </span>
256 </label> 283 </label>
257 <span class="controlled-setting-indicator"
258 content-setting="location" value="ask"></span>
259 </div> 284 </div>
260 <div class="radio controlled-setting-with-label"> 285 <div class="radio controlled-setting-with-label">
261 <label> 286 <label>
262 <input type="radio" name="location" 287 <input type="radio" name="location"
263 value="block"> 288 value="block">
264 <span i18n-content="locationBlock"></span> 289 <span>
290 <span i18n-content="locationBlock"></span>
291 <span class="controlled-setting-indicator"
292 content-setting="location" value="block"></span>
293 </span>
265 </label> 294 </label>
266 <span class="controlled-setting-indicator"
267 content-setting="location" value="block"></span>
268 </div> 295 </div>
269 <if expr="enable_google_now"> 296 <if expr="enable_google_now">
270 <div class="checkbox controlled-setting-with-label" 297 <div class="checkbox controlled-setting-with-label"
271 id="geolocationCheckbox" hidden> 298 id="geolocationCheckbox" hidden>
272 <label> 299 <label>
273 <input pref="googlegeolocationaccess.enabled" 300 <input pref="googlegeolocationaccess.enabled"
274 metric="Options_GoogleGeolocationAccessCheckbox" 301 metric="Options_GoogleGeolocationAccessCheckbox"
275 type="checkbox"> 302 type="checkbox">
276 <span i18n-content="googleGeolocationAccessEnable"></span> 303 <span>
304 <span i18n-content="googleGeolocationAccessEnable"></span>
305 <span class="controlled-setting-indicator"
306 pref="googlegeolocationaccess.enabled"></span>
307 </span>
277 </label> 308 </label>
278 <span class="controlled-setting-indicator"
279 pref="googlegeolocationaccess.enabled"></span>
280 </div> 309 </div>
281 </if> 310 </if>
282 <div class="settings-row"> 311 <div class="settings-row">
283 <button class="exceptions-list-button" contentType="location" 312 <button class="exceptions-list-button" contentType="location"
284 i18n-content="manageExceptions"></button> 313 i18n-content="manageExceptions"></button>
285 </div> 314 </div>
286 </div> 315 </div>
287 <div class="experimental-website-settings" hidden> 316 <div class="experimental-website-settings" hidden>
288 <span id="location-default-string"></span> 317 <span id="location-default-string"></span>
289 <div class="settings-row"> 318 <div class="settings-row">
290 <button class="website-settings-permission-button" 319 <button class="website-settings-permission-button"
291 contentType="geolocation" i18n-content="websitesManage"></button> 320 contentType="geolocation" i18n-content="websitesManage"></button>
292 </div> 321 </div>
293 </div> 322 </div>
294 </section> 323 </section>
295 <!-- Notifications filter tab contents --> 324 <!-- Notifications filter tab contents -->
296 <section id="notifications-section"> 325 <section id="notifications-section">
297 <h3 i18n-content="notificationsTabLabel"></h3> 326 <h3 i18n-content="notificationsTabLabel"></h3>
298 <div class="replace-with-website-settings"> 327 <div class="replace-with-website-settings">
299 <div class="radio controlled-setting-with-label"> 328 <div class="radio controlled-setting-with-label">
300 <label> 329 <label>
301 <input type="radio" name="notifications" value="allow"> 330 <input type="radio" name="notifications" value="allow">
302 <span i18n-content="notificationsAllow"></span> 331 <span>
332 <span i18n-content="notificationsAllow"></span>
333 <span class="controlled-setting-indicator"
334 content-setting="notifications" value="allow"></span>
335 </span>
303 </label> 336 </label>
304 <span class="controlled-setting-indicator"
305 content-setting="notifications" value="allow"></span>
306 </div> 337 </div>
307 <div class="radio controlled-setting-with-label"> 338 <div class="radio controlled-setting-with-label">
308 <label> 339 <label>
309 <input type="radio" name="notifications" value="ask"> 340 <input type="radio" name="notifications" value="ask">
310 <span i18n-content="notificationsAsk"></span> 341 <span>
342 <span i18n-content="notificationsAsk"></span>
343 <span class="controlled-setting-indicator"
344 content-setting="notifications" value="ask"></span>
345 </span>
311 </label> 346 </label>
312 <span class="controlled-setting-indicator"
313 content-setting="notifications" value="ask"></span>
314 </div> 347 </div>
315 <div class="radio controlled-setting-with-label"> 348 <div class="radio controlled-setting-with-label">
316 <label> 349 <label>
317 <input type="radio" name="notifications" value="block"> 350 <input type="radio" name="notifications" value="block">
318 <span i18n-content="notificationsBlock"></span> 351 <span>
352 <span i18n-content="notificationsBlock"></span>
353 <span class="controlled-setting-indicator"
354 content-setting="notifications" value="block"></span>
355 </span>
319 </label> 356 </label>
320 <span class="controlled-setting-indicator"
321 content-setting="notifications" value="block"></span>
322 </div> 357 </div>
323 <div class="settings-row"> 358 <div class="settings-row">
324 <button class="exceptions-list-button" contentType="notifications" 359 <button class="exceptions-list-button" contentType="notifications"
325 i18n-content="manageExceptions"></button> 360 i18n-content="manageExceptions"></button>
326 </div> 361 </div>
327 </div> 362 </div>
328 <div class="experimental-website-settings" hidden> 363 <div class="experimental-website-settings" hidden>
329 <span id="notifications-default-string"></span> 364 <span id="notifications-default-string"></span>
330 <div class="settings-row"> 365 <div class="settings-row">
331 <button class="website-settings-permission-button" 366 <button class="website-settings-permission-button"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 <span i18n-content="mediaSelectMicLabel"></span> 442 <span i18n-content="mediaSelectMicLabel"></span>
408 <select id="media-select-mic" class="weakrtl"></select> 443 <select id="media-select-mic" class="weakrtl"></select>
409 </div> 444 </div>
410 <div class="media-device-control"> 445 <div class="media-device-control">
411 <span i18n-content="mediaSelectCameraLabel"></span> 446 <span i18n-content="mediaSelectCameraLabel"></span>
412 <select id="media-select-camera" class="weakrtl"></select> 447 <select id="media-select-camera" class="weakrtl"></select>
413 </div> 448 </div>
414 <div class="radio controlled-setting-with-label"> 449 <div class="radio controlled-setting-with-label">
415 <label> 450 <label>
416 <input type="radio" name="media-stream" value="ask"> 451 <input type="radio" name="media-stream" value="ask">
417 <span id="media-stream-ask-label" i18n-content="mediaStreamAsk"> 452 <span>
453 <span id="media-stream-ask-label" i18n-content="mediaStreamAsk">
454 </span>
455 <span class="controlled-setting-indicator"
456 content-setting="media-stream" value="ask"></span>
457 </span>
418 </label> 458 </label>
419 <span class="controlled-setting-indicator"
420 content-setting="media-stream" value="ask"></span>
421 </div> 459 </div>
422 <div class="radio controlled-setting-with-label"> 460 <div class="radio controlled-setting-with-label">
423 <label> 461 <label>
424 <input id="media-stream-block" type="radio" name="media-stream" 462 <input id="media-stream-block" type="radio" name="media-stream"
425 value="block"> 463 value="block">
426 <span id="media-stream-block-label" i18n-content="mediaStreamBlock"> 464 <span>
465 <span id="media-stream-block-label"
466 i18n-content="mediaStreamBlock"></span>
467 <span class="controlled-setting-indicator"
468 content-setting="media-stream" value="block"></span>
427 </span> 469 </span>
428 </label> 470 </label>
429 <span class="controlled-setting-indicator"
430 content-setting="media-stream" value="block"></span>
431 </div> 471 </div>
432 <div class="settings-row replace-with-website-settings"> 472 <div class="settings-row replace-with-website-settings">
433 <button class="exceptions-list-button" contentType="media-stream" 473 <button class="exceptions-list-button" contentType="media-stream"
434 i18n-content="manageExceptions"></button> 474 i18n-content="manageExceptions"></button>
435 </div> 475 </div>
436 <div id="media-pepper-flash-default" class="pepper-flash-settings"> 476 <div id="media-pepper-flash-default" class="pepper-flash-settings">
437 <span i18n-content="mediaPepperFlashDefaultDivergedLabel"></span> 477 <span i18n-content="mediaPepperFlashDefaultDivergedLabel"></span>
438 <a target="_blank" i18n-content="mediaPepperFlashChangeLink" 478 <a target="_blank" i18n-content="mediaPepperFlashChangeLink"
439 i18n-values="href:mediaPepperFlashGlobalPrivacyURL"></a> 479 i18n-values="href:mediaPepperFlashGlobalPrivacyURL"></a>
440 </div> 480 </div>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 </div> 515 </div>
476 </section> 516 </section>
477 <!-- Automatic Downloads filter --> 517 <!-- Automatic Downloads filter -->
478 <section> 518 <section>
479 <h3 i18n-content="multipleAutomaticDownloadsTabLabel"></h3> 519 <h3 i18n-content="multipleAutomaticDownloadsTabLabel"></h3>
480 <div class="replace-with-website-settings"> 520 <div class="replace-with-website-settings">
481 <div class="radio controlled-setting-with-label"> 521 <div class="radio controlled-setting-with-label">
482 <label> 522 <label>
483 <input type="radio" name="multiple-automatic-downloads" 523 <input type="radio" name="multiple-automatic-downloads"
484 value="allow"> 524 value="allow">
485 <span i18n-content="multipleAutomaticDownloadsAllow"></span> 525 <span>
526 <span i18n-content="multipleAutomaticDownloadsAllow"></span>
527 <span class="controlled-setting-indicator"
528 content-setting="multiple-automatic-downloads" value="allow">
529 </span>
530 </span>
486 </label> 531 </label>
487 <span class="controlled-setting-indicator"
488 content-setting="multiple-automatic-downloads" value="allow">
489 </span>
490 </div> 532 </div>
491 <div class="radio controlled-setting-with-label"> 533 <div class="radio controlled-setting-with-label">
492 <label> 534 <label>
493 <input type="radio" name="multiple-automatic-downloads" value="ask"> 535 <input type="radio" name="multiple-automatic-downloads" value="ask">
494 <span i18n-content="multipleAutomaticDownloadsAsk"></span> 536 <span>
537 <span i18n-content="multipleAutomaticDownloadsAsk"></span>
538 <span class="controlled-setting-indicator"
539 content-setting="multiple-automatic-downloads" value="ask">
540 </span>
541 </span>
495 </label> 542 </label>
496 <span class="controlled-setting-indicator"
497 content-setting="multiple-automatic-downloads" value="ask"></span>
498 </div> 543 </div>
499 <div class="radio controlled-setting-with-label"> 544 <div class="radio controlled-setting-with-label">
500 <label> 545 <label>
501 <input type="radio" name="multiple-automatic-downloads" 546 <input type="radio" name="multiple-automatic-downloads"
502 value="block"> 547 value="block">
503 <span i18n-content="multipleAutomaticDownloadsBlock"></span> 548 <span>
549 <span i18n-content="multipleAutomaticDownloadsBlock"></span>
550 <span class="controlled-setting-indicator"
551 content-setting="multiple-automatic-downloads" value="block">
552 </span>
553 </span>
504 </label> 554 </label>
505 <span class="controlled-setting-indicator"
506 content-setting="multiple-automatic-downloads" value="block">
507 </span>
508 </div> 555 </div>
509 <div class="settings-row"> 556 <div class="settings-row">
510 <button class="exceptions-list-button" 557 <button class="exceptions-list-button"
511 contentType="multiple-automatic-downloads" 558 contentType="multiple-automatic-downloads"
512 i18n-content="manageExceptions"></button> 559 i18n-content="manageExceptions"></button>
513 </div> 560 </div>
514 </div> 561 </div>
515 <div class="experimental-website-settings" hidden> 562 <div class="experimental-website-settings" hidden>
516 <span id="multiple-automatic-downloads-default-string"></span> 563 <span id="multiple-automatic-downloads-default-string"></span>
517 <div class="settings-row"> 564 <div class="settings-row">
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 </section> 636 </section>
590 </div> 637 </div>
591 <div class="action-area"> 638 <div class="action-area">
592 <div class="button-strip"> 639 <div class="button-strip">
593 <button id="content-settings-overlay-confirm" class="default-button" 640 <button id="content-settings-overlay-confirm" class="default-button"
594 i18n-content="done"> 641 i18n-content="done">
595 </button> 642 </button>
596 </div> 643 </div>
597 </div> 644 </div>
598 </div> 645 </div>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/resources/options/controlled_setting.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698