| 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_expand_button/cr_expa
nd_button.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/icons.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/html/i18n_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 10 <link rel="import" href="../prefs/prefs.html"> | 10 <link rel="import" href="../prefs/prefs.html"> |
| 11 <link rel="import" href="../route.html"> | 11 <link rel="import" href="../route.html"> |
| 12 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 12 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
| 13 <link rel="import" href="../settings_page/settings_subpage.html"> | 13 <link rel="import" href="../settings_page/settings_subpage.html"> |
| 14 <link rel="import" href="../settings_shared_css.html"> | 14 <link rel="import" href="../settings_shared_css.html"> |
| 15 <link rel="import" href="internet_config.html"> |
| 15 <link rel="import" href="internet_detail_page.html"> | 16 <link rel="import" href="internet_detail_page.html"> |
| 16 <link rel="import" href="internet_known_networks_page.html"> | 17 <link rel="import" href="internet_known_networks_page.html"> |
| 17 <link rel="import" href="internet_subpage.html"> | 18 <link rel="import" href="internet_subpage.html"> |
| 18 <link rel="import" href="network_summary.html"> | 19 <link rel="import" href="network_summary.html"> |
| 19 | 20 |
| 20 <dom-module id="settings-internet-page"> | 21 <dom-module id="settings-internet-page"> |
| 21 <template> | 22 <template> |
| 22 <style include="settings-shared"> | 23 <style include="settings-shared"> |
| 23 iron-icon { | 24 iron-icon { |
| 24 -webkit-margin-end: 12px; | 25 -webkit-margin-end: 12px; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 </template> | 75 </template> |
| 75 </template> | 76 </template> |
| 76 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]"> | 77 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]"> |
| 77 <div class="settings-box"> | 78 <div class="settings-box"> |
| 78 <iron-icon class="policy" icon="cr20:domain"></iron-icon> | 79 <iron-icon class="policy" icon="cr20:domain"></iron-icon> |
| 79 <div>$i18n{internetAddConnectionNotAllowed}</div> | 80 <div>$i18n{internetAddConnectionNotAllowed}</div> |
| 80 </div> | 81 </div> |
| 81 </template> | 82 </template> |
| 82 </neon-animatable> | 83 </neon-animatable> |
| 83 | 84 |
| 85 <template is="dom-if" route-path="/networkConfig" no-search> |
| 86 <settings-subpage page-title="$i18n{internetConfigTitle}"> |
| 87 <settings-internet-config networking-private="[[networkingPrivate]]"> |
| 88 </settings-internet-config> |
| 89 </settings-subpage> |
| 90 </template> |
| 91 |
| 84 <template is="dom-if" route-path="/networkDetail" no-search> | 92 <template is="dom-if" route-path="/networkDetail" no-search> |
| 85 <settings-subpage page-title="$i18n{internetDetailPageTitle}"> | 93 <settings-subpage page-title="$i18n{internetDetailPageTitle}"> |
| 86 <settings-internet-detail-page prefs="{{prefs}}" | 94 <settings-internet-detail-page prefs="{{prefs}}" |
| 87 default-network="[[defaultNetwork]]" | 95 default-network="[[defaultNetwork]]" |
| 88 global-policy="[[globalPolicy_]]" | 96 global-policy="[[globalPolicy_]]" |
| 89 networking-private="[[networkingPrivate]]"> | 97 networking-private="[[networkingPrivate]]"> |
| 90 </settings-internet-detail-page> | 98 </settings-internet-detail-page> |
| 91 </settings-subpage> | 99 </settings-subpage> |
| 92 </template> | 100 </template> |
| 93 | 101 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 111 networking-private="[[networkingPrivate]]" | 119 networking-private="[[networkingPrivate]]" |
| 112 show-spinner="{{showSpinner_}}"> | 120 show-spinner="{{showSpinner_}}"> |
| 113 </settings-bluetooth-subpage> | 121 </settings-bluetooth-subpage> |
| 114 </settings-subpage> | 122 </settings-subpage> |
| 115 </template> | 123 </template> |
| 116 | 124 |
| 117 </settings-animated-pages> | 125 </settings-animated-pages> |
| 118 </template> | 126 </template> |
| 119 <script src="internet_page.js"></script> | 127 <script src="internet_page.js"></script> |
| 120 </dom-module> | 128 </dom-module> |
| OLD | NEW |