Index: chrome/browser/resources/settings/controls/settings_dropdown_menu.html |
diff --git a/chrome/browser/resources/settings/controls/settings_dropdown_menu.html b/chrome/browser/resources/settings/controls/settings_dropdown_menu.html |
index 6659294fdfd3016f9a95b5e95a495e99b39a3adb..c834172f57064b9f8f6be35dda2c12bfcc993d3f 100644 |
--- a/chrome/browser/resources/settings/controls/settings_dropdown_menu.html |
+++ b/chrome/browser/resources/settings/controls/settings_dropdown_menu.html |
@@ -1,5 +1,7 @@ |
<link rel="import" href="chrome://resources/html/md_select_css.html"> |
<link rel="import" href="chrome://resources/html/polymer.html"> |
+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_behavior.html"> |
+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html"> |
<link rel="import" href="pref_control_behavior.html"> |
<link rel="import" href="../i18n_setup.html"> |
<link rel="import" href="../prefs/pref_util.html"> |
@@ -9,14 +11,26 @@ |
<dom-module id="settings-dropdown-menu"> |
<template> |
<style include="settings-shared md-select"> |
+ :host { |
+ display: inline-flex; |
+ } |
+ |
+ cr-policy-pref-indicator, |
+ select { |
+ -webkit-margin-start: var(--checkbox-spacing); |
dschuyler
2017/03/02 19:31:37
It could be argued that --checkbox-spacing should
tommycli
2017/03/03 21:26:27
Sounds good, in followup CL sounds good.
|
+ } |
+ |
/* Hide "Custom" value when unselectable. */ |
option:disabled { |
display: none; |
} |
</style> |
+ <template is="dom-if" if="[[pref.controlledBy]]" restamp> |
+ <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator> |
+ </template> |
<div class="md-select-wrapper"> |
<select class="md-select" id="dropdownMenu" on-change="onChange_" |
- disabled="[[shouldDisableMenu_(disabled, menuOptions)]]"> |
+ disabled="[[shouldDisableMenu_(disabled, menuOptions, pref.*)]]"> |
<template is="dom-repeat" items="[[menuOptions]]"> |
<option value="[[item.value]]">[[item.name]]</option> |
</template> |