Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> | 2 <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 _indicator.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> |
| 10 <link rel="import" href="internet_shared_css.html"> | 10 <link rel="import" href="internet_shared_css.html"> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 <!-- Web Proxy Auto Discovery (WPAD) --> | 76 <!-- Web Proxy Auto Discovery (WPAD) --> |
| 77 <div class="settings-box continuation indented" | 77 <div class="settings-box continuation indented" |
| 78 hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]"> | 78 hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]"> |
| 79 <div class="start">$i18n{networkSectionWpad}</div> | 79 <div class="start">$i18n{networkSectionWpad}</div> |
| 80 <div>[[WPAD]]</div> | 80 <div>[[WPAD]]</div> |
| 81 </div> | 81 </div> |
| 82 | 82 |
| 83 <!-- Manual --> | 83 <!-- Manual --> |
| 84 <div id="proxyDiv" class="settings-box continuation single-column indented" | 84 <div id="proxyDiv" class="settings-box continuation single-column indented" |
| 85 hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]"> | 85 hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]"> |
| 86 <paper-checkbox checked="{{useSameProxy}}"> | 86 <paper-checkbox checked="{{useSameProxy_}}"> |
| 87 $i18n{networkProxyUseSame} | 87 $i18n{networkProxyUseSame} |
| 88 </paper-checkbox> | 88 </paper-checkbox> |
| 89 <div hidden$="[[!useSameProxy]]" class="layout vertical"> | 89 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| 90 <network-proxy-input | 90 <network-proxy-input |
| 91 on-proxy-change="onProxyInputChange_" | 91 on-proxy-change="onProxyInputChange_" |
| 92 editable="[[isPropertyEditable_(editable, networkProperties, | 92 editable="[[isPropertyEditable_(editable, networkProperties, |
| 93 'ProxySettings.Manual.HTTPProxy')]]" | 93 'ProxySettings.Manual.HTTPProxy')]]" |
| 94 value="{{proxy.Manual.HTTPProxy}}" | 94 value="{{proxy.Manual.HTTPProxy}}" |
| 95 label="$i18n{networkProxy}"> | 95 label="$i18n{networkProxy}"> |
| 96 </network-proxy-input> | 96 </network-proxy-input> |
| 97 </div> | 97 </div> |
| 98 <div hidden$="[[useSameProxy]]" class="layout vertical"> | 98 <div hidden$="[[useSameProxy_]]" class="layout vertical"> |
|
Dan Beam
2016/08/31 21:59:47
these should probably both be dom-if, no?
stevenjb
2016/08/31 22:10:17
Maybe? Not sure how aggressive we want to be about
| |
| 99 <network-proxy-input | 99 <network-proxy-input |
| 100 on-proxy-change="onProxyInputChange_" | 100 on-proxy-change="onProxyInputChange_" |
| 101 editable="[[isPropertyEditable_(editable, networkProperties, | 101 editable="[[isPropertyEditable_(editable, networkProperties, |
| 102 'ProxySettings.Manual.HTTPProxy)')]]" | 102 'ProxySettings.Manual.HTTPProxy)')]]" |
| 103 value="{{proxy.Manual.HTTPProxy}}" | 103 value="{{proxy.Manual.HTTPProxy}}" |
| 104 label="$i18n{networkProxyHttp}"> | 104 label="$i18n{networkProxyHttp}"> |
| 105 </network-proxy-input> | 105 </network-proxy-input> |
| 106 <network-proxy-input | 106 <network-proxy-input |
| 107 on-proxy-change="onProxyInputChange_" | 107 on-proxy-change="onProxyInputChange_" |
| 108 editable="[[isPropertyEditable_(editable, networkProperties, | 108 editable="[[isPropertyEditable_(editable, networkProperties, |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 137 </paper-input-container> | 137 </paper-input-container> |
| 138 <paper-button on-tap="onAddProxyExclusionTap_"> | 138 <paper-button on-tap="onAddProxyExclusionTap_"> |
| 139 $i18n{networkProxyAddException} | 139 $i18n{networkProxyAddException} |
| 140 </paper-button> | 140 </paper-button> |
| 141 </div> | 141 </div> |
| 142 </div> | 142 </div> |
| 143 </div> | 143 </div> |
| 144 </template> | 144 </template> |
| 145 <script src="network_proxy.js"></script> | 145 <script src="network_proxy.js"></script> |
| 146 </dom-module> | 146 </dom-module> |
| OLD | NEW |