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

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: Rebase 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
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..15ef82ba4d3e857fa4719c15580d858e730041ad 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/polymer/v1_0/polymer/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_events/cr_events.html">
+<link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_indicator.html">
<link rel="import" href="chrome://md-settings/pref_tracker/pref_tracker.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_(disabled, pref)]]">
+ <span id="mainLabel">{{label}}</span>
+ <span id="subLabel">{{subLabel}}</span>
+ </cr-checkbox>
+ <cr-policy-indicator pref="[[pref]]"></cr-policy-indicator>
+ </div>
</template>
<script src="checkbox.js"></script>
</dom-module>
« no previous file with comments | « chrome/browser/resources/settings/checkbox/checkbox.css ('k') | chrome/browser/resources/settings/checkbox/checkbox.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698