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

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

Issue 2688793002: MD Settings: Update Protected Content for redesign (Closed)
Patch Set: fix closure issues Created 3 years, 10 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/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/i18n_behavior.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 4 <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"> 5 <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"> 6 <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"> 7 <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"> 8 <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_dialo g.html"> 9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html">
9 <link rel="import" href="../controls/settings_toggle_button.html"> 10 <link rel="import" href="../controls/settings_toggle_button.html">
10 <link rel="import" href="../lifetime_browser_proxy.html"> 11 <link rel="import" href="../lifetime_browser_proxy.html">
11 <link rel="import" href="../route.html"> 12 <link rel="import" href="../route.html">
12 <link rel="import" href="../settings_page/settings_animated_pages.html"> 13 <link rel="import" href="../settings_page/settings_animated_pages.html">
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 <paper-button class="subpage-title-extra" 412 <paper-button class="subpage-title-extra"
412 on-tap="onRemoveAllCookiesFromSite_"> 413 on-tap="onRemoveAllCookiesFromSite_">
413 $i18n{siteSettingsCookieRemoveAll} 414 $i18n{siteSettingsCookieRemoveAll}
414 </paper-button> 415 </paper-button>
415 <site-data-details-subpage page-title="{{pageTitle}}"> 416 <site-data-details-subpage page-title="{{pageTitle}}">
416 </site-data-details-subpage> 417 </site-data-details-subpage>
417 </settings-subpage> 418 </settings-subpage>
418 </template> 419 </template>
419 <template is="dom-if" route-path="/content/protectedContent" no-search> 420 <template is="dom-if" route-path="/content/protectedContent" no-search>
420 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}"> 421 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}">
422 <div class="settings-box first">
423 <settings-toggle-button class="start"
424 pref="{{prefs.webkit.webprefs.encrypted_media_enabled}}"
425 label="[[getProtectedContentLabel_(
426 prefs.webkit.webprefs.encrypted_media_enabled.value)]]">
427 </settings-toggle-button>
428 </div>
429 <if expr="chromeos or is_win">
421 <div class="settings-box first two-line"> 430 <div class="settings-box first two-line">
422 $i18n{siteSettingsProtectedContentExplanation} 431 $i18n{siteSettingsProtectedContentIdentifiersExplanation}
423 </div> 432 </div>
424 <div class="settings-box first"> 433 <div class="settings-box first">
425 <!-- TODO(dschuyler): change i18n to i18nStr. -->
426 <settings-toggle-button class="start" 434 <settings-toggle-button class="start"
427 pref="{{prefs.settings.privacy.drm_enabled}}" 435 pref="{{prefs.settings.privacy.drm_enabled}}"
428 label="[[getStringTernary_( 436 label="[[getProtectedContentIdentifiersLabel_(
429 prefs.settings.privacy.drm_enabled.value, 437 prefs.settings.privacy.drm_enabled.value)]]">
430 '$i18n{siteSettingsProtectedContentEnable}',
431 '$i18n{siteSettingsBlocked}')]]">
432 </settings-toggle-button> 438 </settings-toggle-button>
433 </div> 439 </div>
440 </if>
434 <if expr="chromeos"> 441 <if expr="chromeos">
435 <category-setting-exceptions 442 <template is="dom-if"
436 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> 443 if="[[prefs.settings.privacy.drm_enabled.value]]">
437 </category-setting-exceptions> 444 <category-setting-exceptions
445 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
446 </category-setting-exceptions>
447 </template>
438 </if> 448 </if>
439 </settings-subpage> 449 </settings-subpage>
440 </template> 450 </template>
441 </settings-animated-pages> 451 </settings-animated-pages>
442 </template> 452 </template>
443 <script src="privacy_page.js"></script> 453 <script src="privacy_page.js"></script>
444 </dom-module> 454 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698