chrome/browser/resources/settings/checkbox/checkbox.js - Issue 1358433003: MD Settings: Make PolicyControllable behavior for isPolicyControlled()

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.js

Issue 1358433003: MD Settings: Make PolicyControllable behavior for isPolicyControlled() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: i have brought great shame upon us 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

« no previous file with comments | « chrome/browser/resources/settings/checkbox/checkbox.html ('k') | chrome/browser/resources/settings/checkbox/compiled_resources.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 49ebb3ab3fa8d1c5b982b250810bc82f0f9990a4..2b5146affb74f80f9b6af6517ad9c5182ef8c009 100644

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

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

@@ -16,6 +16,8 @@

Polymer({

is: 'cr-settings-checkbox',

+ behaviors: [PolicyControllable],

properties: {

/**

* The boolean preference object to control.

@@ -100,8 +102,6 @@ Polymer({

* @private

checkboxDisabled_: function(disabled, pref) {

- return disabled || (!!pref &&

- pref.policyEnforcement ==

- chrome.settingsPrivate.PolicyEnforcement.ENFORCED);

+ return disabled || this.isPolicyControlled(pref);

});