| Index: chrome/browser/resources/settings/controls/settings_dropdown_menu.js
|
| diff --git a/chrome/browser/resources/settings/controls/settings_dropdown_menu.js b/chrome/browser/resources/settings/controls/settings_dropdown_menu.js
|
| index aaf0834b585c9eeac1cb780d0356dfcd4243673a..74870c56648cce502633b532ec306cf6bc50d6ed 100644
|
| --- a/chrome/browser/resources/settings/controls/settings_dropdown_menu.js
|
| +++ b/chrome/browser/resources/settings/controls/settings_dropdown_menu.js
|
| @@ -29,6 +29,8 @@ var DropdownMenuOptionList;
|
| Polymer({
|
| is: 'settings-dropdown-menu',
|
|
|
| + behaviors: [CrPolicyPrefBehavior, PrefControlBehavior],
|
| +
|
| properties: {
|
| /**
|
| * List of options for the drop-down menu.
|
| @@ -57,10 +59,6 @@ Polymer({
|
| },
|
| },
|
|
|
| - behaviors: [
|
| - PrefControlBehavior,
|
| - ],
|
| -
|
| observers: [
|
| 'updateSelected_(menuOptions, pref.value)',
|
| ],
|
| @@ -125,7 +123,7 @@ Polymer({
|
| * @private
|
| */
|
| shouldDisableMenu_: function() {
|
| - return this.disabled || this.menuOptions === null ||
|
| - this.menuOptions.length == 0;
|
| + return this.disabled || this.isPrefEnforced() ||
|
| + this.menuOptions === null || this.menuOptions.length == 0;
|
| },
|
| });
|
|
|