| Index: chrome/browser/resources/settings/controls/settings_slider.js
|
| diff --git a/chrome/browser/resources/settings/controls/settings_slider.js b/chrome/browser/resources/settings/controls/settings_slider.js
|
| index 55ee5baf7859acbff01e1f336fc4919f5691422f..c6b9b59e007198601fa4935a3b07ec8cdf929234 100644
|
| --- a/chrome/browser/resources/settings/controls/settings_slider.js
|
| +++ b/chrome/browser/resources/settings/controls/settings_slider.js
|
| @@ -31,9 +31,11 @@ Polymer({
|
|
|
| labelMax: String,
|
|
|
| + disabled: Boolean,
|
| +
|
| /** @private */
|
| disableSlider_: {
|
| - computed: 'computeDisableSlider_(pref.*)',
|
| + computed: 'computeDisableSlider_(pref.*, disabled)',
|
| type: Boolean,
|
| },
|
| },
|
| @@ -59,7 +61,7 @@ Polymer({
|
|
|
| /** @private */
|
| computeDisableSlider_: function() {
|
| - return this.hasAttribute('disabled') || this.isPrefEnforced();
|
| + return this.disabled || this.isPrefEnforced();
|
| },
|
|
|
| /**
|
|
|