chrome/browser/resources/settings/site_settings/site_settings_category.html - Issue 2280233002: [HBD] Update MD Site Settings Plugins section to show 3rd mode checkbox.

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

Unified Diff: chrome/browser/resources/settings/site_settings/site_settings_category.html

Issue 2280233002: [HBD] Update MD Site Settings Plugins section to show 3rd mode checkbox. (Closed)

Patch Set: merge origin/master Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_settings_behavior.js ('k') | chrome/browser/resources/settings/site_settings/site_settings_category.js » ('j') | chrome/test/data/webui/settings/site_settings_category_tests.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/site_settings/site_settings_category.html

diff --git a/chrome/browser/resources/settings/site_settings/site_settings_category.html b/chrome/browser/resources/settings/site_settings/site_settings_category.html

index 663cba15042f0304fd7aed0d63697e5c92ca80a9..d005a33db9050312b5ab790583281c6e04e0c99b 100644

--- a/chrome/browser/resources/settings/site_settings/site_settings_category.html

+++ b/chrome/browser/resources/settings/site_settings/site_settings_category.html

@@ -1,4 +1,5 @@

+<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">

@@ -40,15 +41,24 @@

- <div class="start secondary">

- [[computeCategoryDesc(category, categoryEnabled, showRecommendation)]]

- </div>

+ <div class="start secondary">[[sliderDescription_]]</div>

<paper-toggle-button id="toggle" checked="{{categoryEnabled}}"

- on-change="onToggleChange_"></paper-toggle-button>

+ on-change="onChangePermissionControl_"></paper-toggle-button>

</div>

+ <template is="dom-if" if="[[isFlashCategory_(category)]]">

+ <div class="settings-box two-line">

+ <paper-checkbox id="flashAskCheckbox" checked="{{flashAskFirst_}}"

+ on-change="onChangePermissionControl_"

+ disabled="[[!categoryEnabled]]">

+ <div>$i18n{siteSettingsFlashAskBefore}</div>

+ <div class="secondary">$i18n{siteSettingsFlashAskBeforeSubtitle}</div>

+ </paper-checkbox>

+ </div>

+ </template>