chrome/browser/resources/settings/controls/settings_boolean_control_behavior.js - Issue 2708013003: [MD settings] show icon when content settings are controlled by an extension

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/controls/settings_boolean_control_behavior.js

Issue 2708013003: [MD settings] show icon when content settings are controlled by an extension (Closed)

Patch Set: ignore-extensions Created 3 years, 10 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/resources/settings/appearance_page/appearance_page.html ('K') | « chrome/browser/resources/settings/appearance_page/appearance_page.html ('k') | chrome/browser/resources/settings/controls/settings_input.js » ('j') | ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/controls/settings_boolean_control_behavior.js

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

index 85614f97ac4030767af0eda69036eac424ff9c37..fe053e4569d11723fa4868f2ba4be5464dd5e47f 100644

--- a/chrome/browser/resources/settings/controls/settings_boolean_control_behavior.js

+++ b/chrome/browser/resources/settings/controls/settings_boolean_control_behavior.js

@@ -124,7 +124,7 @@ var SettingsBooleanControlBehaviorImpl = {

* @private

controlDisabled_: function() {

- return this.disabled || this.isPrefPolicyControlled(assert(this.pref));

+ return this.disabled || this.isPrefEnforced(assert(this.pref));

};