Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
| 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> |
| 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 6 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 7 <link rel="import" href="chrome://resources/html/polymer.html"> | 7 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 flex: none; | 40 flex: none; |
| 41 } | 41 } |
| 42 | 42 |
| 43 #exceptionsDiv { | 43 #exceptionsDiv { |
| 44 padding: 10px 0; | 44 padding: 10px 0; |
| 45 } | 45 } |
| 46 | 46 |
| 47 #exceptionsDiv network-proxy-exclusions { | 47 #exceptionsDiv network-proxy-exclusions { |
| 48 margin: 10px 0; | 48 margin: 10px 0; |
| 49 } | 49 } |
| 50 | |
| 51 #proxyDiv paper-toggle-button { | |
| 52 padding: 10px 0; | |
| 53 } | |
| 54 </style> | 50 </style> |
| 55 | 51 |
| 56 <!-- Policy indicator. Only one dom-if below will be shown. --> | 52 <!-- Policy indicator. Only one dom-if below will be shown. --> |
| 57 <template is="dom-if" | 53 <template is="dom-if" |
| 58 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> | 54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> |
| 59 <div class="settings-box continuation single-column"> | 55 <div class="settings-box continuation single-column"> |
| 60 <div class="layout horizontal center"> | 56 <div class="layout horizontal center"> |
| 61 <cr-policy-network-indicator | 57 <cr-policy-network-indicator |
| 62 property="[[networkProperties.ProxySettings.Type]]"> | 58 property="[[networkProperties.ProxySettings.Type]]"> |
| 63 </cr-policy-network-indicator> | 59 </cr-policy-network-indicator> |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 116 </div> | 112 </div> |
| 117 | 113 |
| 118 <!-- Web Proxy Auto Discovery (WPAD) --> | 114 <!-- Web Proxy Auto Discovery (WPAD) --> |
| 119 <div class="settings-box continuation indent" | 115 <div class="settings-box continuation indent" |
| 120 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> | 116 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> |
| 121 <div>$i18n{networkSectionWpad}</div> | 117 <div>$i18n{networkSectionWpad}</div> |
| 122 <div class="middle flex">[[WPAD_]]</div> | 118 <div class="middle flex">[[WPAD_]]</div> |
| 123 </div> | 119 </div> |
| 124 | 120 |
| 125 <!-- Manual --> | 121 <!-- Manual --> |
| 126 <div id="proxyDiv" class="settings-box continuation single-column indent" | 122 <div class="settings-box continuation indent" |
| 127 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | 123 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
| 128 <div class="flex layout horizontal"> | 124 <div id="networkProxyToggleLabel" class="flex"> |
| 129 <div id="networkProxyToggleLabel" class="flex"> | 125 $i18n{networkProxyUseSame} |
| 130 $i18n{networkProxyUseSame} | |
| 131 </div> | |
| 132 <paper-toggle-button checked="{{useSameProxy_}}" | |
| 133 disabled="[[!isEditable_('Type', networkProperties, editable, | |
| 134 useSharedProxies_)]]" | |
| 135 aria-labelledby="networkProxyToggleLabel"> | |
| 136 </paper-toggle-button> | |
| 137 </div> | 126 </div> |
| 127 <paper-toggle-button checked="{{useSameProxy_}}" | |
| 128 disabled="[[!isEditable_('Type', networkProperties, editable, | |
| 129 useSharedProxies_)]]" | |
| 130 aria-labelledby="networkProxyToggleLabel"> | |
| 131 </paper-toggle-button> | |
| 132 </div> | |
| 133 | |
| 134 <div class="settings-box continuation single-column indent" | |
| 135 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | |
|
Dan Beam
2017/03/04 02:25:55
every time i see a hidden$= instead of a dom-if, a
stevenjb
2017/03/06 18:33:49
If it helps you feel better, all of network-proxy
| |
| 138 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 136 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| 139 <network-proxy-input | 137 <network-proxy-input |
| 140 on-proxy-change="onProxyInputChange_" | 138 on-proxy-change="onProxyInputChange_" |
| 141 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, | 139 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, |
| 142 editable, useSharedProxies_)]]" | 140 editable, useSharedProxies_)]]" |
| 143 value="{{proxy_.Manual.HTTPProxy}}" | 141 value="{{proxy_.Manual.HTTPProxy}}" |
| 144 label="$i18n{networkProxy}"> | 142 label="$i18n{networkProxy}"> |
| 145 </network-proxy-input> | 143 </network-proxy-input> |
| 146 </div> | 144 </div> |
| 147 <div hidden$="[[useSameProxy_]]" class="layout vertical"> | 145 <div hidden$="[[useSameProxy_]]" class="layout vertical"> |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 215 </paper-button> | 213 </paper-button> |
| 216 <paper-button class="action-button" | 214 <paper-button class="action-button" |
| 217 on-tap="onAllowSharedDialogConfirm_"> | 215 on-tap="onAllowSharedDialogConfirm_"> |
| 218 $i18n{confirm} | 216 $i18n{confirm} |
| 219 </paper-button> | 217 </paper-button> |
| 220 </div> | 218 </div> |
| 221 </dialog> | 219 </dialog> |
| 222 </template> | 220 </template> |
| 223 <script src="network_proxy.js"></script> | 221 <script src="network_proxy.js"></script> |
| 224 </dom-module> | 222 </dom-module> |
| OLD | NEW |