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

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/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 unified diff | 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

2 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_chec kbox.html">	2 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_chec kbox.html">

3 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_events/cr_events .html">	3 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_events/cr_events .html">

	4 <link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_in dicator.html">

4 <link rel="import" href="chrome://md-settings/pref_tracker/pref_tracker.html">	5 <link rel="import" href="chrome://md-settings/pref_tracker/pref_tracker.html">

5	6

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

7 <link rel="import" type="css" href="checkbox.css">	8 <link rel="import" type="css" href="checkbox.css">

8 <template>	9 <template>

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

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

11	12

12 <cr-checkbox id="checkbox" checked="{{checked}}"	13 <div id="outerDiv" class="layout horizontal center">

13 disabled="[[disabled]]">	14 <cr-checkbox id="checkbox" checked="{{checked}}"

14 <span class="main-label">{{label}}</span>	15 disabled="[[checkboxDisabled]]">

15 <span class="sub-label">{{subLabel}}</span>	16 <span id="mainLabel">{{label}}</span>

16 </cr-checkbox>	17 <span id="subLabel">{{subLabel}}</span>

	18 </cr-checkbox>

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

	20 </div>

17 </template>	21 </template>

18 <script src="checkbox.js"></script>	22 <script src="checkbox.js"></script>

19 </dom-module>	23 </dom-module>

OLD	NEW