Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/assert.html"> | 1 <link rel="import" href="chrome://resources/html/assert.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or_behavior.html"> | |
| 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_be havior.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_be havior.html"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> |
| 7 <link rel="import" href="pref_control_behavior.html"> | 6 <link rel="import" href="pref_control_behavior.html"> |
| 8 <link rel="import" href="../i18n_setup.html"> | 7 <link rel="import" href="../i18n_setup.html"> |
| 9 <link rel="import" href="../settings_shared_css.html"> | 8 <link rel="import" href="../settings_shared_css.html"> |
| 10 | 9 |
| 11 <dom-module id="controlled-button"> | 10 <dom-module id="controlled-button"> |
| 12 <template> | 11 <template> |
| 13 <style include="settings-shared"> | 12 <style include="settings-shared"> |
| 14 :host { | 13 :host { |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 36 :host([end-justified]) cr-policy-pref-indicator { | 35 :host([end-justified]) cr-policy-pref-indicator { |
| 37 -webkit-margin-end: var(--justify-margin); | 36 -webkit-margin-end: var(--justify-margin); |
| 38 order: -1; | 37 order: -1; |
| 39 } | 38 } |
| 40 </style> | 39 </style> |
| 41 | 40 |
| 42 <paper-button disabled="[[controlled_]]"> | 41 <paper-button disabled="[[controlled_]]"> |
| 43 <content></content> | 42 <content></content> |
| 44 </paper-button> | 43 </paper-button> |
| 45 | 44 |
| 46 <template is="dom-if" if="[[showIndicator_(pref)]]" restamp> | 45 <template is="dom-if" if="[[hasPolicy(pref.*)]]" restamp> |
|
stevenjb (google-dont-use)
2017/02/22 01:01:10
Should this be [[indicatorVisible]]?
michaelpg
2017/02/22 21:00:01
It amounts to the same thing, just from the other
| |
| 47 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_"> | 46 <cr-policy-pref-indicator pref="[[pref]]" on-tap="onIndicatorTap_"> |
| 48 </cr-policy-pref-indicator> | 47 </cr-policy-pref-indicator> |
| 49 </template> | 48 </template> |
| 50 | 49 |
| 51 </template> | 50 </template> |
| 52 <script src="controlled_button.js"></script> | 51 <script src="controlled_button.js"></script> |
| 53 </dom-module> | 52 </dom-module> |
| OLD | NEW |