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/hidden_style_css.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
| 4 <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 _behavior.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> |
| 6 <link rel="import" href="chrome://resources/html/assert.html"> | 6 <link rel="import" href="chrome://resources/html/assert.html"> |
| 7 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 7 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
| 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 9 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 9 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 10 <link rel="import" href="chrome://resources/html/polymer.html"> | 10 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> | 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> |
| 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> | 15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> |
| 15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| 16 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 17 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
| 17 <link rel="import" href="../controls/settings_toggle_button.html"> | 18 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 18 <link rel="import" href="../i18n_setup.html"> | 19 <link rel="import" href="../i18n_setup.html"> |
| 19 <link rel="import" href="../prefs/prefs_behavior.html"> | 20 <link rel="import" href="../prefs/prefs_behavior.html"> |
| 20 <link rel="import" href="../settings_vars_css.html"> | 21 <link rel="import" href="../settings_vars_css.html"> |
| 21 <link rel="import" href="internet_shared_css.html"> | 22 <link rel="import" href="internet_shared_css.html"> |
| 22 <link rel="import" href="network_proxy_exclusions.html"> | 23 <link rel="import" href="network_proxy_exclusions.html"> |
| 23 <link rel="import" href="network_proxy_input.html"> | 24 <link rel="import" href="network_proxy_input.html"> |
| 24 | 25 |
| 25 <dom-module id="network-proxy"> | 26 <dom-module id="network-proxy"> |
| 26 <template> | 27 <template> |
| 27 <style include="internet-shared md-select cr-hidden-style"> | 28 <style include="internet-shared md-select cr-hidden-style iron-flex"> |
| 28 cr-policy-network-indicator { | 29 cr-policy-network-indicator { |
| 29 -webkit-margin-end: 10px; | 30 -webkit-margin-end: 10px; |
| 30 } | 31 } |
| 31 | 32 |
| 32 extension-controlled-indicator { | 33 extension-controlled-indicator { |
| 33 -webkit-margin-start: 0; | 34 -webkit-margin-start: 0; |
| 34 width: 100%; | 35 width: 100%; |
| 35 } | 36 } |
| 36 | 37 |
| 37 network-proxy-input { | 38 network-proxy-input { |
| 38 margin-bottom: 10px; | 39 margin-bottom: 10px; |
| 39 } | 40 } |
| 40 | 41 |
| 41 #exceptionsDiv { | 42 #exceptionsDiv { |
| 42 padding: 10px 0; | 43 padding: 10px 0; |
| 43 } | 44 } |
| 44 | 45 |
| 45 network-proxy-exclusions { | 46 network-proxy-exclusions { |
| 46 margin: 10px 0; | 47 margin: 10px 0; |
| 47 } | 48 } |
| 48 </style> | 49 </style> |
| 49 | 50 |
| 50 <!-- Policy indicator. Only one dom-if below will be shown. --> | 51 <!-- Policy indicator. Only one dom-if below will be shown. --> |
| 51 <template is="dom-if" | 52 <template is="dom-if" |
| 52 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> | 53 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> |
| 53 <div class="list-frame"> | 54 <div class="list-frame"> |
| 54 <div class="layout horizontal center"> | 55 <div class="layout horizontal center"> |
|
dschuyler
2017/05/16 23:19:53
Will .settings-row work here in place of "layout h
stevenjb
2017/05/16 23:35:05
Not exactly. It adds some other stuff that doesn't
| |
| 55 <cr-policy-network-indicator | 56 <cr-policy-network-indicator |
| 56 property="[[networkProperties.ProxySettings.Type]]" | 57 property="[[networkProperties.ProxySettings.Type]]" |
| 57 no-extension-indicator> | 58 no-extension-indicator> |
| 58 </cr-policy-network-indicator> | 59 </cr-policy-network-indicator> |
| 59 <div>$i18n{networkProxyEnforcedPolicy}</div> | 60 <div>$i18n{networkProxyEnforcedPolicy}</div> |
| 60 </div> | 61 </div> |
| 61 </div> | 62 </div> |
| 62 </template> | 63 </template> |
| 63 <template is="dom-if" | 64 <template is="dom-if" |
| 64 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> | 65 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 </div> | 127 </div> |
| 127 <paper-toggle-button checked="{{useSameProxy_}}" | 128 <paper-toggle-button checked="{{useSameProxy_}}" |
| 128 disabled="[[!isEditable_('Type', networkProperties, editable, | 129 disabled="[[!isEditable_('Type', networkProperties, editable, |
| 129 useSharedProxies_)]]" | 130 useSharedProxies_)]]" |
| 130 aria-labelledby="networkProxyToggleLabel"> | 131 aria-labelledby="networkProxyToggleLabel"> |
| 131 </paper-toggle-button> | 132 </paper-toggle-button> |
| 132 </div> | 133 </div> |
| 133 | 134 |
| 134 <div class="list-frame" | 135 <div class="list-frame" |
| 135 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | 136 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
| 136 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 137 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
|
dschuyler
2017/05/16 23:19:53
.single-column may work in place of "layout vertic
stevenjb
2017/05/16 23:35:05
Again, that also sets a couple of extra properties
| |
| 137 <network-proxy-input | 138 <network-proxy-input |
| 138 on-proxy-change="onProxyInputChange_" | 139 on-proxy-change="onProxyInputChange_" |
| 139 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, | 140 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, |
| 140 editable, useSharedProxies_)]]" | 141 editable, useSharedProxies_)]]" |
| 141 value="{{proxy_.Manual.HTTPProxy}}" | 142 value="{{proxy_.Manual.HTTPProxy}}" |
| 142 label="$i18n{networkProxy}"> | 143 label="$i18n{networkProxy}"> |
| 143 </network-proxy-input> | 144 </network-proxy-input> |
| 144 </div> | 145 </div> |
| 145 <div hidden$="[[useSameProxy_]]" class="layout vertical"> | 146 <div hidden$="[[useSameProxy_]]" class="layout vertical"> |
| 146 <network-proxy-input | 147 <network-proxy-input |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 214 </paper-button> | 215 </paper-button> |
| 215 <paper-button class="action-button" | 216 <paper-button class="action-button" |
| 216 on-tap="onAllowSharedDialogConfirm_"> | 217 on-tap="onAllowSharedDialogConfirm_"> |
| 217 $i18n{confirm} | 218 $i18n{confirm} |
| 218 </paper-button> | 219 </paper-button> |
| 219 </div> | 220 </div> |
| 220 </dialog> | 221 </dialog> |
| 221 </template> | 222 </template> |
| 222 <script src="network_proxy.js"></script> | 223 <script src="network_proxy.js"></script> |
| 223 </dom-module> | 224 </dom-module> |
| OLD | NEW |