| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 | 2 |
| 3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 8 <link rel="import" href="chrome://resources/html/assert.html"> | 8 <link rel="import" href="chrome://resources/html/assert.html"> |
| 9 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 9 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
| 10 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 10 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 } | 37 } |
| 38 | 38 |
| 39 network-proxy-input { | 39 network-proxy-input { |
| 40 margin-bottom: 10px; | 40 margin-bottom: 10px; |
| 41 } | 41 } |
| 42 | 42 |
| 43 network-proxy-exclusions { | 43 network-proxy-exclusions { |
| 44 margin: 10px 0; | 44 margin: 10px 0; |
| 45 } | 45 } |
| 46 | 46 |
| 47 .settings-box:first-of-type { |
| 48 border-top: none; |
| 49 } |
| 50 |
| 47 #manualProxy { | 51 #manualProxy { |
| 48 @apply(--settings-list-frame-padding); | 52 @apply(--settings-list-frame-padding); |
| 49 } | 53 } |
| 50 </style> | 54 </style> |
| 51 | 55 |
| 52 <!-- Policy indicator. Only one dom-if below will be shown. --> | 56 <!-- Policy indicator. Only one dom-if below will be shown. --> |
| 53 <template is="dom-if" | 57 <template is="dom-if" |
| 54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> | 58 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> |
| 55 <div class="settings-box"> | 59 <div class="settings-box"> |
| 56 <div class="layout horizontal center"> | 60 <div class="layout horizontal center"> |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 </paper-button> | 219 </paper-button> |
| 216 <paper-button class="action-button" | 220 <paper-button class="action-button" |
| 217 on-tap="onAllowSharedDialogConfirm_"> | 221 on-tap="onAllowSharedDialogConfirm_"> |
| 218 $i18n{confirm} | 222 $i18n{confirm} |
| 219 </paper-button> | 223 </paper-button> |
| 220 </div> | 224 </div> |
| 221 </dialog> | 225 </dialog> |
| 222 </template> | 226 </template> |
| 223 <script src="network_proxy.js"></script> | 227 <script src="network_proxy.js"></script> |
| 224 </dom-module> | 228 </dom-module> |
| OLD | NEW |