| 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/network/cr_onc_types.htm
l"> | 3 <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"> | 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
_indicator.html"> | 5 <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"> | 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 7 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 7 <link rel="import" href="chrome://resources/html/polymer.html"> | 8 <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"> | 9 <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"> | 10 <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"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
-container.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> | 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 13 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 14 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
| 14 <link rel="import" href="../controls/settings_toggle_button.html"> | 15 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 15 <link rel="import" href="../i18n_setup.html"> | 16 <link rel="import" href="../i18n_setup.html"> |
| 16 <link rel="import" href="../prefs/prefs_behavior.html"> | 17 <link rel="import" href="../prefs/prefs_behavior.html"> |
| 17 <link rel="import" href="../settings_vars_css.html"> | 18 <link rel="import" href="../settings_vars_css.html"> |
| 18 <link rel="import" href="internet_shared_css.html"> | 19 <link rel="import" href="internet_shared_css.html"> |
| 19 <link rel="import" href="network_proxy_exclusions.html"> | 20 <link rel="import" href="network_proxy_exclusions.html"> |
| 20 <link rel="import" href="network_proxy_input.html"> | 21 <link rel="import" href="network_proxy_input.html"> |
| 21 | 22 |
| 22 <dom-module id="network-proxy"> | 23 <dom-module id="network-proxy"> |
| 23 <template> | 24 <template> |
| 24 <style include="internet-shared md-select"> | 25 <style include="internet-shared md-select cr-hidden-style"> |
| 25 cr-policy-network-indicator { | 26 cr-policy-network-indicator { |
| 26 -webkit-margin-end: 10px; | 27 -webkit-margin-end: 10px; |
| 27 } | 28 } |
| 28 | 29 |
| 29 extension-controlled-indicator { | 30 extension-controlled-indicator { |
| 30 -webkit-margin-start: 0; | 31 -webkit-margin-start: 0; |
| 31 width: 100%; | 32 width: 100%; |
| 32 } | 33 } |
| 33 | 34 |
| 34 network-proxy-input { | 35 network-proxy-input { |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 </paper-button> | 212 </paper-button> |
| 212 <paper-button class="action-button" | 213 <paper-button class="action-button" |
| 213 on-tap="onAllowSharedDialogConfirm_"> | 214 on-tap="onAllowSharedDialogConfirm_"> |
| 214 $i18n{confirm} | 215 $i18n{confirm} |
| 215 </paper-button> | 216 </paper-button> |
| 216 </div> | 217 </div> |
| 217 </dialog> | 218 </dialog> |
| 218 </template> | 219 </template> |
| 219 <script src="network_proxy.js"></script> | 220 <script src="network_proxy.js"></script> |
| 220 </dom-module> | 221 </dom-module> |
| OLD | NEW |