Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7131)

Unified Diff: chrome/browser/resources/settings/controls/settings_dropdown_menu.js

Issue 2728683004: [MD settings] controlled by extension icon on default font size (Closed)
Patch Set: closure Created 3 years, 10 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
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;
},
});

Powered by Google App Engine
This is Rietveld 408576698