chrome/browser/resources/settings/controls/settings_input.js - Issue 1369403006: Add cr-policy-network-indicator and add to internet settings

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

Issue 1369403006: Add cr-policy-network-indicator and add to internet settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Separate policy indicator strings Created 5 years, 2 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/controls/settings_input.html ('k') | chrome/browser/resources/settings/internet_page/compiled_resources.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5c1d9572157f7ca87dbd6a9879fcd862a2e77e96..ab0cfe50c6befc4b94f8b8ebc59edcb905b569fd 100644

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

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

@@ -12,12 +12,12 @@

Polymer({

is: 'settings-input',

- behaviors: [PolicyControllable],

+ behaviors: [CrPolicyPrefBehavior],

properties: {

/**

* The preference object to control.

- * @type {chrome.settingsPrivate.PrefObject|undefined}

+ * @type {!chrome.settingsPrivate.PrefObject|undefined}

pref: {

type: Object,

@@ -128,11 +128,11 @@ Polymer({

/**

* @param {boolean} disabled

- * @param {?chrome.settingsPrivate.PrefObject} pref

+ * @param {!chrome.settingsPrivate.PrefObject} pref

* @return {boolean} Whether the element should be disabled.

* @private

isDisabled_: function(disabled, pref) {

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

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

});