| Index: chrome/browser/resources/settings/controls/controlled_radio_button.js
|
| diff --git a/chrome/browser/resources/settings/controls/controlled_button.js b/chrome/browser/resources/settings/controls/controlled_radio_button.js
|
| similarity index 54%
|
| copy from chrome/browser/resources/settings/controls/controlled_button.js
|
| copy to chrome/browser/resources/settings/controls/controlled_radio_button.js
|
| index a072e37d91a1e3c5efce8b680a1533821033abb8..dd758323af607f0078329276aade26359f965165 100644
|
| --- a/chrome/browser/resources/settings/controls/controlled_button.js
|
| +++ b/chrome/browser/resources/settings/controls/controlled_radio_button.js
|
| @@ -3,11 +3,16 @@
|
| // found in the LICENSE file.
|
|
|
| Polymer({
|
| - is: 'controlled-button',
|
| + is: 'controlled-radio-button',
|
|
|
| behaviors: [CrPolicyPrefBehavior, PrefControlBehavior],
|
|
|
| properties: {
|
| + name: {
|
| + type: String,
|
| + notify: true,
|
| + },
|
| +
|
| /** @private */
|
| controlled_: {
|
| type: Boolean,
|
| @@ -17,20 +22,32 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {!chrome.settingsPrivate.PrefObject} pref
|
| + * @param {chrome.settingsPrivate.PrefObject} pref
|
| * @return {boolean} Whether the button is disabled.
|
| * @private
|
| */
|
| computeControlled_: function(pref) {
|
| + var pref = /** @type {!chrome.settingsPrivate.PrefObject} */(this.pref);
|
| return this.isPrefPolicyControlled(pref);
|
| },
|
|
|
| /**
|
| + * @param {boolean} controlled
|
| + * @param {string} name
|
| + * @param {chrome.settingsPrivate.PrefObject} pref
|
| + * @return {boolean}
|
| + * @private
|
| + */
|
| + showIndicator_: function(controlled, name, pref) {
|
| + return controlled && name == Settings.PrefUtil.prefToString(pref);
|
| + },
|
| +
|
| + /**
|
| * @param {!Event} e
|
| * @private
|
| */
|
| onIndicatorTap_: function(e) {
|
| - // Disallow <controlled-button on-tap="..."> when controlled.
|
| + // Disallow <controlled-radio-button on-tap="..."> when controlled.
|
| e.preventDefault();
|
| e.stopPropagation();
|
| },
|
|
|