chrome/browser/resources/settings/privacy_page/privacy_page.html - Issue 2673633003: MD Settings: Add Protected Content Content Settings exceptions

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: update tests 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

OLD	NEW
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 429 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
440 </template>	440 </template>

441 <if expr="chromeos or is_win">	441 <if expr="chromeos or is_win">

442 <template is="dom-if" route-path="/content/protectedContent" no-search>	442 <template is="dom-if" route-path="/content/protectedContent" no-search>

443 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}">	443 <settings-subpage page-title="$i18n{siteSettingsProtectedContent}">

444 <div class="settings-box first">	444 <div class="settings-box first">

445 <settings-toggle-button class="start"	445 <settings-toggle-button class="start"

446 pref="{{prefs.settings.privacy.drm_enabled}}"	446 pref="{{prefs.settings.privacy.drm_enabled}}"

447 label="$i18n{siteSettingsProtectedContentEnable}">	447 label="$i18n{siteSettingsProtectedContentEnable}">

448 </settings-toggle-button>	448 </settings-toggle-button>

449 </div>	449 </div>

	450 <if expr="chromeos">

	451 <category-setting-exceptions

	452 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">

	453 </category-setting-exceptions>

	454 </if>

450 </settings-subpage>	455 </settings-subpage>

451 </template>	456 </template>

452 </if>	457 </if>

453 </settings-animated-pages>	458 </settings-animated-pages>

454 </template>	459 </template>

455 <script src="privacy_page.js"></script>	460 <script src="privacy_page.js"></script>

456 </dom-module>	461 </dom-module>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_resources.grd » ('j') | no next file with comments »