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

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

Issue 2655463010: [MD settings] correct label for policy controlled flash settings (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | chrome/browser/resources/settings/site_settings/category_default_setting.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="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html"> 8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html">
9 <link rel="import" href="/controls/settings_toggle_button.html"> 9 <link rel="import" href="/controls/settings_toggle_button.html">
10 <link rel="import" href="/lifetime_browser_proxy.html"> 10 <link rel="import" href="/lifetime_browser_proxy.html">
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 <template is="dom-if" route-path="/content/all" no-search> 209 <template is="dom-if" route-path="/content/all" no-search>
210 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}"> 210 <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}">
211 <all-sites></all-sites> 211 <all-sites></all-sites>
212 </settings-subpage> 212 </settings-subpage>
213 </template> 213 </template>
214 <template is="dom-if" route-path="/content/automaticDownloads" no-search> 214 <template is="dom-if" route-path="/content/automaticDownloads" no-search>
215 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}"> 215 <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}">
216 <button class="icon-help subpage-title-extra" 216 <button class="icon-help subpage-title-extra"
217 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 217 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
218 <category-default-setting 218 <category-default-setting
219 toggle-off-label="$i18n{siteSettingsAutoDownloadBlock}"
220 toggle-on-label="$i18n{siteSettingsAutoDownloadAskRecommended}"
219 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> 221 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
220 </category-default-setting> 222 </category-default-setting>
221 <category-setting-exceptions 223 <category-setting-exceptions
222 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"> 224 category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
223 </category-setting-exceptions> 225 </category-setting-exceptions>
224 </settings-subpage> 226 </settings-subpage>
225 </template> 227 </template>
226 <template is="dom-if" route-path="/content/backgroundSync" no-search> 228 <template is="dom-if" route-path="/content/backgroundSync" no-search>
227 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}"> 229 <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}">
228 <button class="icon-help subpage-title-extra" 230 <button class="icon-help subpage-title-extra"
229 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 231 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
230 <category-default-setting 232 <category-default-setting
233 toggle-off-label="$i18n{siteSettingsBackgroundSyncBlocked}"
234 toggle-on-label=
235 "$i18n{siteSettingsAllowRecentlyClosedSitesRecommended}"
231 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> 236 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
232 </category-default-setting> 237 </category-default-setting>
233 <category-setting-exceptions 238 <category-setting-exceptions
234 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"> 239 category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
235 </category-setting-exceptions> 240 </category-setting-exceptions>
236 </settings-subpage> 241 </settings-subpage>
237 </template> 242 </template>
238 <template is="dom-if" route-path="/content/camera" no-search> 243 <template is="dom-if" route-path="/content/camera" no-search>
239 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}"> 244 <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}">
240 <button class="icon-help subpage-title-extra" 245 <button class="icon-help subpage-title-extra"
241 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 246 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
242 <media-picker type="camera"></media-picker> 247 <media-picker type="camera"></media-picker>
243 <category-default-setting category="{{ContentSettingsTypes.CAMERA}}"> 248 <category-default-setting category="{{ContentSettingsTypes.CAMERA}}"
249 toggle-off-label="$i18n{siteSettingsBlocked}"
250 toggle-on-label=
251 "$i18n{siteSettingsAskBeforeAccessingRecommended}">
244 </category-default-setting> 252 </category-default-setting>
245 <category-setting-exceptions 253 <category-setting-exceptions
246 category="{{ContentSettingsTypes.CAMERA}}"> 254 category="{{ContentSettingsTypes.CAMERA}}">
247 </category-setting-exceptions> 255 </category-setting-exceptions>
248 </settings-subpage> 256 </settings-subpage>
249 </template> 257 </template>
250 <template is="dom-if" route-path="/content/cookies" no-search> 258 <template is="dom-if" route-path="/content/cookies" no-search>
251 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> 259 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
252 <button class="icon-help subpage-title-extra" 260 <button class="icon-help subpage-title-extra"
253 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 261 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
254 <category-default-setting category="{{ContentSettingsTypes.COOKIES}}" 262 <category-default-setting category="{{ContentSettingsTypes.COOKIES}}"
263 toggle-off-label="$i18n{siteSettingsBlocked}"
264 toggle-on-label="$i18n{siteSettingsCookiesAllowedRecommended}"
255 sub-option-label="$i18n{deleteDataPostSession}" 265 sub-option-label="$i18n{deleteDataPostSession}"
256 sub-option-secondary=""><!-- To work with :empty. --> 266 sub-option-secondary=""><!-- To work with :empty. -->
257 </category-default-setting> 267 </category-default-setting>
258 <div class="settings-box"> 268 <div class="settings-box">
259 <settings-toggle-button class="start" 269 <settings-toggle-button class="start"
260 pref="{{prefs.profile.block_third_party_cookies}}" 270 pref="{{prefs.profile.block_third_party_cookies}}"
261 label="$i18n{thirdPartyCookie}" 271 label="$i18n{thirdPartyCookie}"
262 sub-label="$i18n{thirdPartyCookieSublabel}"> 272 sub-label="$i18n{thirdPartyCookieSublabel}">
263 </settings-toggle-button> 273 </settings-toggle-button>
264 </div> 274 </div>
265 <category-setting-exceptions 275 <category-setting-exceptions
266 category="{{ContentSettingsTypes.COOKIES}}"> 276 category="{{ContentSettingsTypes.COOKIES}}">
267 </category-setting-exceptions> 277 </category-setting-exceptions>
268 <site-data></site-data> 278 <site-data></site-data>
269 </settings-subpage> 279 </settings-subpage>
270 </template> 280 </template>
271 <template is="dom-if" route-path="/content/images" no-search> 281 <template is="dom-if" route-path="/content/images" no-search>
272 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}"> 282 <settings-subpage page-title="$i18n{siteSettingsCategoryImages}">
273 <button class="icon-help subpage-title-extra" 283 <button class="icon-help subpage-title-extra"
274 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 284 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
275 <category-default-setting category="{{ContentSettingsTypes.IMAGES}}"> 285 <category-default-setting category="{{ContentSettingsTypes.IMAGES}}"
286 toggle-off-label="$i18n{siteSettingsDontShowImages}"
287 toggle-on-label="$i18n{siteSettingsShowAllRecommended}">
276 </category-default-setting> 288 </category-default-setting>
277 <category-setting-exceptions 289 <category-setting-exceptions
278 category="{{ContentSettingsTypes.IMAGES}}"> 290 category="{{ContentSettingsTypes.IMAGES}}">
279 </category-setting-exceptions> 291 </category-setting-exceptions>
280 </settings-subpage> 292 </settings-subpage>
281 </template> 293 </template>
282 <template is="dom-if" route-path="/content/location" no-search> 294 <template is="dom-if" route-path="/content/location" no-search>
283 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}"> 295 <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}">
284 <button class="icon-help subpage-title-extra" 296 <button class="icon-help subpage-title-extra"
285 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 297 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
286 <category-default-setting 298 <category-default-setting
299 toggle-off-label="$i18n{siteSettingsBlocked}"
300 toggle-on-label="$i18n{siteSettingsAskBeforeAccessingRecommended}"
287 category="{{ContentSettingsTypes.GEOLOCATION}}"> 301 category="{{ContentSettingsTypes.GEOLOCATION}}">
288 </category-default-setting> 302 </category-default-setting>
289 <category-setting-exceptions 303 <category-setting-exceptions
290 category="{{ContentSettingsTypes.GEOLOCATION}}"> 304 category="{{ContentSettingsTypes.GEOLOCATION}}">
291 </category-setting-exceptions> 305 </category-setting-exceptions>
292 </settings-subpage> 306 </settings-subpage>
293 </template> 307 </template>
294 <template is="dom-if" route-path="/handlers" no-search> 308 <template is="dom-if" route-path="/handlers" no-search>
295 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}"> 309 <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}">
296 <protocol-handlers></protocol-handlers> 310 <protocol-handlers></protocol-handlers>
297 </settings-subpage> 311 </settings-subpage>
298 </template> 312 </template>
299 <template is="dom-if" route-path="/content/zoomLevels" no-search> 313 <template is="dom-if" route-path="/content/zoomLevels" no-search>
300 <settings-subpage page-title="$i18n{siteSettingsCategoryZoomLevels}"> 314 <settings-subpage page-title="$i18n{siteSettingsCategoryZoomLevels}">
301 <zoom-levels></zoom-levels> 315 <zoom-levels></zoom-levels>
302 </settings-subpage> 316 </settings-subpage>
303 </template> 317 </template>
304 <template is="dom-if" route-path="/content/pdfDocuments" no-search> 318 <template is="dom-if" route-path="/content/pdfDocuments" no-search>
305 <settings-subpage page-title="$i18n{siteSettingsPdfDocuments}"> 319 <settings-subpage page-title="$i18n{siteSettingsPdfDocuments}">
306 <settings-pdf-documents prefs="{{prefs}}"></settings-pdf-documents> 320 <settings-pdf-documents prefs="{{prefs}}"></settings-pdf-documents>
307 </settings-subpage> 321 </settings-subpage>
308 </template> 322 </template>
309 <template is="dom-if" route-path="/content/javascript" no-search> 323 <template is="dom-if" route-path="/content/javascript" no-search>
310 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}"> 324 <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}">
311 <button class="icon-help subpage-title-extra" 325 <button class="icon-help subpage-title-extra"
312 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 326 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
313 <category-default-setting 327 <category-default-setting
328 toggle-off-label="$i18n{siteSettingsBlocked}"
329 toggle-on-label="$i18n{siteSettingsAllowedRecommended}"
314 category="{{ContentSettingsTypes.JAVASCRIPT}}"> 330 category="{{ContentSettingsTypes.JAVASCRIPT}}">
315 </category-default-setting> 331 </category-default-setting>
316 <category-setting-exceptions 332 <category-setting-exceptions
317 category="{{ContentSettingsTypes.JAVASCRIPT}}"> 333 category="{{ContentSettingsTypes.JAVASCRIPT}}">
318 </category-setting-exceptions> 334 </category-setting-exceptions>
319 </settings-subpage> 335 </settings-subpage>
320 </template> 336 </template>
321 <template is="dom-if" route-path="/content/microphone" no-search> 337 <template is="dom-if" route-path="/content/microphone" no-search>
322 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"> 338 <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}">
323 <button class="icon-help subpage-title-extra" 339 <button class="icon-help subpage-title-extra"
324 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 340 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
325 <media-picker type="mic"></media-picker> 341 <media-picker type="mic"></media-picker>
326 <category-default-setting category="{{ContentSettingsTypes.MIC}}"> 342 <category-default-setting category="{{ContentSettingsTypes.MIC}}"
343 toggle-off-label="$i18n{siteSettingsBlocked}"
344 toggle-on-label=
345 "$i18n{siteSettingsAskBeforeAccessingRecommended}">
327 </category-default-setting> 346 </category-default-setting>
328 <category-setting-exceptions category="{{ContentSettingsTypes.MIC}}"> 347 <category-setting-exceptions category="{{ContentSettingsTypes.MIC}}">
329 </category-setting-exceptions> 348 </category-setting-exceptions>
330 </settings-subpage> 349 </settings-subpage>
331 </template> 350 </template>
332 <template is="dom-if" route-path="/content/notifications" no-search> 351 <template is="dom-if" route-path="/content/notifications" no-search>
333 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}"> 352 <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}">
334 <button class="icon-help subpage-title-extra" 353 <button class="icon-help subpage-title-extra"
335 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 354 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
336 <category-default-setting 355 <category-default-setting
356 toggle-off-label="$i18n{siteSettingsBlocked}"
357 toggle-on-label="$i18n{siteSettingsAskBeforeSendingRecommended}"
337 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> 358 category="{{ContentSettingsTypes.NOTIFICATIONS}}">
338 </category-default-setting> 359 </category-default-setting>
339 <category-setting-exceptions 360 <category-setting-exceptions
340 category="{{ContentSettingsTypes.NOTIFICATIONS}}"> 361 category="{{ContentSettingsTypes.NOTIFICATIONS}}">
341 </category-setting-exceptions> 362 </category-setting-exceptions>
342 </settings-subpage> 363 </settings-subpage>
343 </template> 364 </template>
344 <template is="dom-if" route-path="/content/flash" no-search> 365 <template is="dom-if" route-path="/content/flash" no-search>
345 <settings-subpage page-title="$i18n{siteSettingsFlash}"> 366 <settings-subpage page-title="$i18n{siteSettingsFlash}">
346 <button class="icon-help subpage-title-extra" 367 <button class="icon-help subpage-title-extra"
347 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 368 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
348 <category-default-setting category="{{ContentSettingsTypes.PLUGINS}}" 369 <category-default-setting category="{{ContentSettingsTypes.PLUGINS}}"
370 toggle-off-label="$i18n{siteSettingsFlashBlock}"
371 toggle-on-label="$i18n{siteSettingsFlashAllow}"
349 sub-option-label="$i18n{siteSettingsFlashAskBefore}" 372 sub-option-label="$i18n{siteSettingsFlashAskBefore}"
350 sub-option-secondary="$i18n{siteSettingsFlashAskBeforeSubtitle}"> 373 sub-option-secondary="$i18n{siteSettingsFlashAskBeforeSubtitle}">
351 </category-default-setting> 374 </category-default-setting>
352 <if expr="chromeos"> 375 <if expr="chromeos">
353 <div actionable class="settings-box" 376 <div actionable class="settings-box"
354 on-tap="onAdobeFlashStorageClicked_"> 377 on-tap="onAdobeFlashStorageClicked_">
355 <div class="list-item list-button">$i18n{adobeFlashStorage}</div> 378 <div class="list-item list-button">$i18n{adobeFlashStorage}</div>
356 </div> 379 </div>
357 </if> 380 </if>
358 <category-setting-exceptions 381 <category-setting-exceptions
359 category="{{ContentSettingsTypes.PLUGINS}}"> 382 category="{{ContentSettingsTypes.PLUGINS}}">
360 </category-setting-exceptions> 383 </category-setting-exceptions>
361 </settings-subpage> 384 </settings-subpage>
362 </template> 385 </template>
363 <template is="dom-if" route-path="/content/popups" no-search> 386 <template is="dom-if" route-path="/content/popups" no-search>
364 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> 387 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
365 <button class="icon-help subpage-title-extra" 388 <button class="icon-help subpage-title-extra"
366 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 389 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
367 <category-default-setting category="{{ContentSettingsTypes.POPUPS}}"> 390 <category-default-setting category="{{ContentSettingsTypes.POPUPS}}"
391 toggle-off-label="$i18n{siteSettingsBlockedRecommended}"
392 toggle-on-label="$i18n{siteSettingsAllowed}">
368 </category-default-setting> 393 </category-default-setting>
369 <category-setting-exceptions 394 <category-setting-exceptions
370 category="{{ContentSettingsTypes.POPUPS}}"> 395 category="{{ContentSettingsTypes.POPUPS}}">
371 </category-setting-exceptions> 396 </category-setting-exceptions>
372 </settings-subpage> 397 </settings-subpage>
373 </template> 398 </template>
374 <template is="dom-if" route-path="/content/unsandboxedPlugins" no-search> 399 <template is="dom-if" route-path="/content/unsandboxedPlugins" no-search>
375 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"> 400 <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
376 <button class="icon-help subpage-title-extra" 401 <button class="icon-help subpage-title-extra"
377 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 402 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
378 <category-default-setting 403 <category-default-setting
404 toggle-off-label="$i18n{siteSettingsUnsandboxedPluginsBlock}"
405 toggle-on-label=
406 "$i18n{siteSettingsUnsandboxedPluginsAskRecommended}"
379 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> 407 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
380 </category-default-setting> 408 </category-default-setting>
381 <category-setting-exceptions 409 <category-setting-exceptions
382 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"> 410 category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
383 </category-setting-exceptions> 411 </category-setting-exceptions>
384 </settings-subpage> 412 </settings-subpage>
385 </template> 413 </template>
386 <template is="dom-if" route-path="/content/usbDevices" no-search> 414 <template is="dom-if" route-path="/content/usbDevices" no-search>
387 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}"> 415 <settings-subpage page-title="$i18n{siteSettingsUsbDevices}">
388 <usb-devices></usb-devices> 416 <usb-devices></usb-devices>
(...skipping 11 matching lines...) Expand all
400 $i18n{siteSettingsCookieRemoveAll} 428 $i18n{siteSettingsCookieRemoveAll}
401 </paper-button> 429 </paper-button>
402 <site-data-details-subpage page-title="{{pageTitle}}"> 430 <site-data-details-subpage page-title="{{pageTitle}}">
403 </site-data-details-subpage> 431 </site-data-details-subpage>
404 </settings-subpage> 432 </settings-subpage>
405 </template> 433 </template>
406 </settings-animated-pages> 434 </settings-animated-pages>
407 </template> 435 </template>
408 <script src="privacy_page.js"></script> 436 <script src="privacy_page.js"></script>
409 </dom-module> 437 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/site_settings/category_default_setting.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698