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 17 matching lines...) Expand all Loading... | |
| 28 | 28 |
| 29 extension-controlled-indicator { | 29 extension-controlled-indicator { |
| 30 -webkit-margin-start: 0; | 30 -webkit-margin-start: 0; |
| 31 width: 100%; | 31 width: 100%; |
| 32 } | 32 } |
| 33 | 33 |
| 34 network-proxy-input { | 34 network-proxy-input { |
| 35 margin-bottom: 10px; | 35 margin-bottom: 10px; |
| 36 } | 36 } |
| 37 | 37 |
| 38 /* Use .middle spacing but no flex. */ | |
| 39 .settings-box .middle { | |
| 40 flex: none; | |
| 41 } | |
| 42 | |
| 43 #exceptionsDiv { | 38 #exceptionsDiv { |
| 44 padding: 10px 0; | 39 padding: 10px 0; |
| 45 } | 40 } |
| 46 | 41 |
| 47 #exceptionsDiv network-proxy-exclusions { | 42 network-proxy-exclusions { |
| 48 margin: 10px 0; | 43 margin: 10px 0; |
| 49 } | 44 } |
| 50 </style> | 45 </style> |
| 51 | 46 |
| 52 <!-- Policy indicator. Only one dom-if below will be shown. --> | 47 <!-- Policy indicator. Only one dom-if below will be shown. --> |
| 53 <template is="dom-if" | 48 <template is="dom-if" |
| 54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> | 49 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> |
| 55 <div class="settings-box continuation single-column"> | 50 <div class="list-frame"> |
| 56 <div class="layout horizontal center"> | 51 <div class="layout horizontal center"> |
| 57 <cr-policy-network-indicator | 52 <cr-policy-network-indicator |
| 58 property="[[networkProperties.ProxySettings.Type]]" | 53 property="[[networkProperties.ProxySettings.Type]]" |
| 59 no-extension-indicator> | 54 no-extension-indicator> |
| 60 </cr-policy-network-indicator> | 55 </cr-policy-network-indicator> |
| 61 <div>$i18n{networkProxyEnforcedPolicy}</div> | 56 <div>$i18n{networkProxyEnforcedPolicy}</div> |
| 62 </div> | 57 </div> |
| 63 </div> | 58 </div> |
| 64 </template> | 59 </template> |
| 65 <template is="dom-if" | 60 <template is="dom-if" |
| 66 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> | 61 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> |
| 67 <div class="settings-box continuation single-column"> | 62 <div class="list-frame"> |
| 68 <extension-controlled-indicator | 63 <extension-controlled-indicator |
| 69 extension-id="[[prefs.proxy.extensionId]]" | 64 extension-id="[[prefs.proxy.extensionId]]" |
| 70 extension-name="[[prefs.proxy.controlledByName]]" | 65 extension-name="[[prefs.proxy.controlledByName]]" |
| 71 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"> | 66 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"> |
| 72 </extension-controlled-indicator> | 67 </extension-controlled-indicator> |
| 73 </div> | 68 </div> |
| 74 </template> | 69 </template> |
| 75 | 70 |
| 76 <!-- Allow shared proxies --> | 71 <!-- Allow shared proxies --> |
| 77 <div class="settings-box continuation" | 72 <div class="settings-box continuation indent" |
|
dschuyler
2017/03/28 01:38:06
I'm glad the .list-frame worked out in the cases a
stevenjb
2017/03/29 20:56:10
This one would work, but only because the single c
| |
| 78 hidden$="[[!shouldShowAllowShared_( | 73 hidden$="[[!shouldShowAllowShared_( |
| 79 networkProperties.ProxySettings.Type)]]"> | 74 networkProperties.ProxySettings.Type)]]"> |
| 80 <settings-toggle-button id="allowShared" class="start" | 75 <settings-toggle-button id="allowShared" class="start" |
| 81 pref="{{prefs.settings.use_shared_proxies}}" | 76 pref="{{prefs.settings.use_shared_proxies}}" |
| 82 label="$i18n{networkProxyAllowShared}" | 77 label="$i18n{networkProxyAllowShared}" |
| 83 on-settings-boolean-control-change="onAllowSharedProxiesChange_" | 78 on-settings-boolean-control-change="onAllowSharedProxiesChange_" |
| 84 no-set-pref> | 79 no-set-pref> |
| 85 </settings-toggle-button> | 80 </settings-toggle-button> |
| 86 </div> | 81 </div> |
| 87 | 82 |
| 88 <!-- Proxy type dropdown --> | 83 <!-- Proxy type dropdown --> |
| 89 <div class="settings-box continuation"> | 84 <div class="settings-box continuation indent"> |
| 90 <div class="start">$i18n{networkProxyConnectionType}</div> | 85 <div class="start">$i18n{networkProxyConnectionType}</div> |
| 91 <div class="md-select-wrapper"> | 86 <div class="md-select-wrapper"> |
| 92 <select id="proxyType" class="md-select" on-change="onTypeChange_" | 87 <select id="proxyType" class="md-select" on-change="onTypeChange_" |
| 93 value="[[proxy_.Type]]" | 88 value="[[proxy_.Type]]" |
| 94 disabled="[[!isEditable_('Type', networkProperties, editable, | 89 disabled="[[!isEditable_('Type', networkProperties, editable, |
| 95 useSharedProxies_)]]"> | 90 useSharedProxies_)]]"> |
| 96 <template is="dom-repeat" items="[[proxyTypes_]]"> | 91 <template is="dom-repeat" items="[[proxyTypes_]]"> |
| 97 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option> | 92 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option> |
| 98 </template> | 93 </template> |
| 99 </select> | 94 </select> |
| 100 <span class="md-select-underline"></span> | 95 <span class="md-select-underline"></span> |
| 101 </div> | 96 </div> |
| 102 </div> | 97 </div> |
| 103 | 98 |
| 104 <!-- Autoconfiguration (PAC) --> | 99 <!-- Autoconfiguration (PAC) --> |
| 105 <div class="settings-box continuation indent" | 100 <div class="settings-box continuation indent" |
| 106 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.PAC)]]"> | 101 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.PAC)]]"> |
| 107 <div>$i18n{networkProxyAutoConfig}</div> | 102 <div>$i18n{networkProxyAutoConfig}</div> |
| 108 <paper-input no-label-float class="middle flex" value="{{proxy_.PAC}}" | 103 <paper-input no-label-float class="middle" value="{{proxy_.PAC}}" |
| 109 disabled="[[!isEditable_('PAC', networkProperties, editable, | 104 disabled="[[!isEditable_('PAC', networkProperties, editable, |
| 110 useSharedProxies_)]]" | 105 useSharedProxies_)]]" |
| 111 on-change="onPACChange_"> | 106 on-change="onPACChange_"> |
| 112 </paper-input> | 107 </paper-input> |
| 113 </div> | 108 </div> |
| 114 | 109 |
| 115 <!-- Web Proxy Auto Discovery (WPAD) --> | 110 <!-- Web Proxy Auto Discovery (WPAD) --> |
| 116 <div class="settings-box continuation indent" | 111 <div class="settings-box continuation indent" |
| 117 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> | 112 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> |
| 118 <div>$i18n{networkSectionWpad}</div> | 113 <div>$i18n{networkSectionWpad}</div> |
| 119 <div class="middle flex">[[WPAD_]]</div> | 114 <div class="middle">[[WPAD_]]</div> |
| 120 </div> | 115 </div> |
| 121 | 116 |
| 122 <!-- Manual --> | 117 <!-- Manual --> |
| 123 <div class="settings-box continuation indent" | 118 <div class="settings-box continuation indent" |
| 124 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | 119 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
| 125 <div id="networkProxyToggleLabel" class="flex"> | 120 <div id="networkProxyToggleLabel" class="flex"> |
| 126 $i18n{networkProxyUseSame} | 121 $i18n{networkProxyUseSame} |
| 127 </div> | 122 </div> |
| 128 <paper-toggle-button checked="{{useSameProxy_}}" | 123 <paper-toggle-button checked="{{useSameProxy_}}" |
| 129 disabled="[[!isEditable_('Type', networkProperties, editable, | 124 disabled="[[!isEditable_('Type', networkProperties, editable, |
| 130 useSharedProxies_)]]" | 125 useSharedProxies_)]]" |
| 131 aria-labelledby="networkProxyToggleLabel"> | 126 aria-labelledby="networkProxyToggleLabel"> |
| 132 </paper-toggle-button> | 127 </paper-toggle-button> |
| 133 </div> | 128 </div> |
| 134 | 129 |
| 135 <div class="settings-box continuation single-column indent" | 130 <div class="list-frame" |
| 136 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | 131 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
| 137 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 132 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| 138 <network-proxy-input | 133 <network-proxy-input |
| 139 on-proxy-change="onProxyInputChange_" | 134 on-proxy-change="onProxyInputChange_" |
| 140 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, | 135 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, |
| 141 editable, useSharedProxies_)]]" | 136 editable, useSharedProxies_)]]" |
| 142 value="{{proxy_.Manual.HTTPProxy}}" | 137 value="{{proxy_.Manual.HTTPProxy}}" |
| 143 label="$i18n{networkProxy}"> | 138 label="$i18n{networkProxy}"> |
| 144 </network-proxy-input> | 139 </network-proxy-input> |
| 145 </div> | 140 </div> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 214 </paper-button> | 209 </paper-button> |
| 215 <paper-button class="action-button" | 210 <paper-button class="action-button" |
| 216 on-tap="onAllowSharedDialogConfirm_"> | 211 on-tap="onAllowSharedDialogConfirm_"> |
| 217 $i18n{confirm} | 212 $i18n{confirm} |
| 218 </paper-button> | 213 </paper-button> |
| 219 </div> | 214 </div> |
| 220 </dialog> | 215 </dialog> |
| 221 </template> | 216 </template> |
| 222 <script src="network_proxy.js"></script> | 217 <script src="network_proxy.js"></script> |
| 223 </dom-module> | 218 </dom-module> |
| OLD | NEW |