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

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

Issue 2677003004: MD Settings: Make Protected Content setting available to all platforms. (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 399-settings-make-enab… 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
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/route.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_dialo g.html"> 8 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 <template is="dom-if" route-path="/cookies/detail" no-search> 431 <template is="dom-if" route-path="/cookies/detail" no-search>
432 <settings-subpage page-title="[[pageTitle]]"> 432 <settings-subpage page-title="[[pageTitle]]">
433 <paper-button class="subpage-title-extra" 433 <paper-button class="subpage-title-extra"
434 on-tap="onRemoveAllCookiesFromSite_"> 434 on-tap="onRemoveAllCookiesFromSite_">
435 $i18n{siteSettingsCookieRemoveAll} 435 $i18n{siteSettingsCookieRemoveAll}
436 </paper-button> 436 </paper-button>
437 <site-data-details-subpage page-title="{{pageTitle}}"> 437 <site-data-details-subpage page-title="{{pageTitle}}">
438 </site-data-details-subpage> 438 </site-data-details-subpage>
439 </settings-subpage> 439 </settings-subpage>
440 </template> 440 </template>
441 <if expr="chromeos or is_win">
442 <template is="dom-if" route-path="/content/protectedContent" no-search> 441 <template is="dom-if" route-path="/content/protectedContent" no-search>
443 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}"> 442 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}">
444 <div class="settings-box first two-line"> 443 <div class="settings-box first two-line">
445 $i18n{siteSettingsProtectedContentExplanation} 444 $i18n{siteSettingsProtectedContentExplanation}
446 </div> 445 </div>
447 <div class="settings-box first"> 446 <div class="settings-box first">
448 <settings-toggle-button class="start" 447 <settings-toggle-button class="start"
449 pref="{{prefs.settings.privacy.drm_enabled}}" 448 pref="{{prefs.settings.privacy.drm_enabled}}"
450 label="$i18n{siteSettingsProtectedContentEnable}"> 449 label="$i18n{siteSettingsProtectedContentEnable}">
451 </settings-toggle-button> 450 </settings-toggle-button>
452 </div> 451 </div>
453 <if expr="chromeos"> 452 <if expr="chromeos">
454 <category-setting-exceptions 453 <category-setting-exceptions
455 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> 454 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
456 </category-setting-exceptions> 455 </category-setting-exceptions>
457 </if> 456 </if>
458 </settings-subpage> 457 </settings-subpage>
459 </template> 458 </template>
460 </if>
461 </settings-animated-pages> 459 </settings-animated-pages>
462 </template> 460 </template>
463 <script src="privacy_page.js"></script> 461 <script src="privacy_page.js"></script>
464 </dom-module> 462 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/route.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698