| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 padding: 10px 0; | 52 padding: 10px 0; |
| 53 } | 53 } |
| 54 </style> | 54 </style> |
| 55 | 55 |
| 56 <!-- Policy indicator. Only one dom-if below will be shown. --> | 56 <!-- Policy indicator. Only one dom-if below will be shown. --> |
| 57 <template is="dom-if" | 57 <template is="dom-if" |
| 58 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> | 58 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> |
| 59 <div class="settings-box continuation single-column"> | 59 <div class="settings-box continuation single-column"> |
| 60 <div class="layout horizontal center"> | 60 <div class="layout horizontal center"> |
| 61 <cr-policy-network-indicator | 61 <cr-policy-network-indicator |
| 62 property="[[networkProperties.ProxySettings.Type]]"> | 62 property="[[networkProperties.ProxySettings.Type]]" |
| 63 ignore-extensions> |
| 63 </cr-policy-network-indicator> | 64 </cr-policy-network-indicator> |
| 64 <div>$i18n{networkProxyEnforcedPolicy}</div> | 65 <div>$i18n{networkProxyEnforcedPolicy}</div> |
| 65 </div> | 66 </div> |
| 66 </div> | 67 </div> |
| 67 </template> | 68 </template> |
| 68 <template is="dom-if" | 69 <template is="dom-if" |
| 69 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> | 70 if="[[shouldShowExtensionIndicator_(networkProperties)]]"> |
| 70 <div class="settings-box continuation single-column"> | 71 <div class="settings-box continuation single-column"> |
| 71 <extension-controlled-indicator | 72 <extension-controlled-indicator |
| 72 extension-id="[[prefs.proxy.extensionId]]" | 73 extension-id="[[prefs.proxy.extensionId]]" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 </paper-button> | 216 </paper-button> |
| 216 <paper-button class="action-button" | 217 <paper-button class="action-button" |
| 217 on-tap="onAllowSharedDialogConfirm_"> | 218 on-tap="onAllowSharedDialogConfirm_"> |
| 218 $i18n{confirm} | 219 $i18n{confirm} |
| 219 </paper-button> | 220 </paper-button> |
| 220 </div> | 221 </div> |
| 221 </dialog> | 222 </dialog> |
| 222 </template> | 223 </template> |
| 223 <script src="network_proxy.js"></script> | 224 <script src="network_proxy.js"></script> |
| 224 </dom-module> | 225 </dom-module> |
| OLD | NEW |