chrome/browser/resources/settings/checkbox/checkbox.html - Issue 1310373008: Add cr_policy_indicator for settings controls

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/checkbox/checkbox.html

Issue 1310373008: Add cr_policy_indicator for settings controls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_settings_compiled_resources_3

Patch Set: Revert unrelated changes Created 5 years, 3 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

« chrome/browser/extensions/api/settings_private/prefs_util.cc ('K') | « chrome/browser/resources/settings/checkbox/checkbox.css ('k') | chrome/browser/resources/settings/checkbox/checkbox.js » ('j') | chrome/browser/resources/settings/checkbox/checkbox.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/checkbox/checkbox.html

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

index d2aa431a0e3f0b47be5fa6a6562e2591722858ae..1f6299da9528f0ff8b3b65b54639cf874627ef64 100644

--- a/chrome/browser/resources/settings/checkbox/checkbox.html

+++ b/chrome/browser/resources/settings/checkbox/checkbox.html

@@ -1,6 +1,7 @@

+<link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_indicator.html">

<dom-module id="cr-settings-checkbox">

@@ -9,11 +10,14 @@

<cr-events id="events"></cr-events>

<cr-settings-pref-tracker pref="[[pref]]"></cr-settings-pref-tracker>

- <cr-checkbox id="checkbox" checked="{{checked}}"

- disabled="[[disabled]]">

- <span class="main-label">{{label}}</span>

- <span class="sub-label">{{subLabel}}</span>

- </cr-checkbox>

+ <div id="outerDiv" class="layout horizontal center">

+ <cr-checkbox id="checkbox" checked="{{checked}}"

+ disabled="[[checkboxDisabled]]">

+ <span id="mainLabel">{{label}}</span>

+ <span id="subLabel">{{subLabel}}</span>

+ </cr-checkbox>

+ <cr-policy-indicator pref="[[pref]]"></cr-policy-indicator>

+ </div>

</template>

</dom-module>