chrome/browser/resources/options/content_settings.js - Issue 1825173003: [Policy Experimental] Add "recommended" policies for URL exceptions.

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/options/content_settings.js

Issue 1825173003: [Policy Experimental] Add "recommended" policies for URL exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync. Created 4 years, 9 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/options/content_settings.css ('k') | chrome/browser/resources/options/content_settings_exceptions_area.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/content_settings.js

diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js

index db335e89b12da61fcac306a2062399826292e85d..67ece0668df048e127dd60388ee6872a83536f45 100644

--- a/chrome/browser/resources/options/content_settings.js

+++ b/chrome/browser/resources/options/content_settings.js

@@ -126,14 +126,15 @@ cr.define('options', function() {

}

var managedBy = dict[group].managedBy;

- var controlledBy = managedBy == 'policy' || managedBy == 'extension' ?

- managedBy : null;

+ var controlledBy = managedBy == 'policy' || managedBy == 'extension' ||

+ managedBy == 'recommended' ? managedBy : null;

document.querySelector('input[type=radio][name=' + group + '][value=' +

dict[group].value + ']').checked = true;

var radios = document.querySelectorAll('input[type=radio][name=' +

group + ']');

for (var i = 0, len = radios.length; i < len; i++) {

- radios[i].disabled = (managedBy != 'default');

+ radios[i].disabled = managedBy != 'default' &&

+ managedBy != 'recommended';

radios[i].controlledBy = controlledBy;

}

var indicators = document.querySelectorAll(