Chromium Code Reviews| Index: chrome/browser/resources/settings/controls/controlled_button.html |
| diff --git a/chrome/browser/resources/settings/controls/controlled_button.html b/chrome/browser/resources/settings/controls/controlled_button.html |
| index 9868ce04efb72caf2cab394fa1bdc87ecdad5c92..f90b1c15375cc43194e3c93f87ee18490c81bfd8 100644 |
| --- a/chrome/browser/resources/settings/controls/controlled_button.html |
| +++ b/chrome/browser/resources/settings/controls/controlled_button.html |
| @@ -3,6 +3,7 @@ |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.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="chrome://resources/cr_elements/policy/cr_policy_indicator_behavior.html"> |
| <link rel="import" href="/controls/pref_control_behavior.html"> |
| <link rel="import" href="/settings_shared_css.html"> |
| @@ -21,18 +22,27 @@ |
| } |
| cr-policy-pref-indicator { |
| - -webkit-margin-start: var(--checkbox-spacing); |
| /* Enable pointer events for the indicator so :hover works. Disable |
| * clicks/taps via onIndicatorTap_ so outer on-tap doesn't trigger. */ |
| pointer-events: all; |
| } |
| + |
| + :host(:not([right-justified])) cr-policy-pref-indicator { |
| + -webkit-margin-start: var(--checkbox-spacing); |
|
dschuyler
2017/01/05 20:25:05
optional since this is just moving exiting code, b
Dan Beam
2017/01/06 02:45:29
Done.
|
| + } |
| + |
| + :host([right-justified]) cr-policy-pref-indicator { |
| + -webkit-margin-end: var(--checkbox-spacing); |
| + order: -1; |
| + } |
| </style> |
| <paper-button disabled="[[controlled_]]"> |
| <content></content> |
| </paper-button> |
| - <template is="dom-if" if="[[controlled_]]"> |
| + <template is="dom-if" if="[[showIndicator_(pref.controlledBy, |
| + pref.enforcement)]]"> |
|
dschuyler
2017/01/05 20:25:05
This seems different from the checkbox to toggle c
Dan Beam
2017/01/06 02:45:29
split to a separate CL.
|
| <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_"> |
| </cr-policy-pref-indicator> |
| </template> |