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

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

Issue 2673633003: MD Settings: Add Protected Content Content Settings exceptions (Closed)
Patch Set: 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 | « no previous file | chrome/browser/resources/settings/site_settings/constants.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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 </template> 439 </template>
440 <if expr="chromeos or is_win"> 440 <if expr="chromeos or is_win">
441 <template is="dom-if" route-path="/content/protectedContent"> 441 <template is="dom-if" route-path="/content/protectedContent">
442 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}"> 442 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}">
443 <div class="settings-box first"> 443 <div class="settings-box first">
444 <settings-toggle-button class="start" 444 <settings-toggle-button class="start"
445 pref="{{prefs.settings.privacy.drm_enabled}}" 445 pref="{{prefs.settings.privacy.drm_enabled}}"
446 label="$i18n{siteSettingsProtectedContentEnable}"> 446 label="$i18n{siteSettingsProtectedContentEnable}">
447 </settings-toggle-button> 447 </settings-toggle-button>
448 </div> 448 </div>
449 <if expr="chromeos">
dpapad 2017/02/03 22:54:11 The "Protected Content" section is present on both
tommycli 2017/02/03 22:58:47 Yessir see here for the Options equivalent code: h
dpapad 2017/02/03 23:09:22 Thanks for the link.
450 <category-setting-exceptions
451 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
452 </category-setting-exceptions>
453 </if>
449 </settings-subpage> 454 </settings-subpage>
450 </template> 455 </template>
451 </if> 456 </if>
452 </settings-animated-pages> 457 </settings-animated-pages>
453 </template> 458 </template>
454 <script src="privacy_page.js"></script> 459 <script src="privacy_page.js"></script>
455 </dom-module> 460 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/site_settings/constants.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698