Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html"> |
| 8 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html"> | 8 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html"> |
| 9 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_network_ icon.html"> | 9 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_network_ icon.html"> |
| 10 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type s.html"> | 10 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type s.html"> |
| 11 <link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_ne twork_behavior.html"> | |
| 12 <link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_ne twork_indicator.html"> | |
| 11 <link rel="import" href="network_apnlist.html"> | 13 <link rel="import" href="network_apnlist.html"> |
| 12 <link rel="import" href="network_ip_config.html"> | 14 <link rel="import" href="network_ip_config.html"> |
| 13 <link rel="import" href="network_nameservers.html"> | 15 <link rel="import" href="network_nameservers.html"> |
| 14 <link rel="import" href="network_property_list.html"> | 16 <link rel="import" href="network_property_list.html"> |
| 15 <link rel="import" href="network_proxy.html"> | 17 <link rel="import" href="network_proxy.html"> |
| 16 <link rel="import" href="network_siminfo.html"> | 18 <link rel="import" href="network_siminfo.html"> |
| 17 | 19 |
| 18 <dom-module id="cr-settings-internet-detail-page"> | 20 <dom-module id="cr-settings-internet-detail-page"> |
| 19 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css"> | 21 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css"> |
| 20 <link rel="import" type="css" href="internet_detail_page.css"> | 22 <link rel="import" type="css" href="internet_detail_page.css"> |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 42 | 44 |
| 43 <!-- Info and properties common to all networks. --> | 45 <!-- Info and properties common to all networks. --> |
| 44 <div id="infoDiv" class="layout vertical"> | 46 <div id="infoDiv" class="layout vertical"> |
| 45 <div class="layout horizontal" hidden$="[[!IPAddress]]"> | 47 <div class="layout horizontal" hidden$="[[!IPAddress]]"> |
| 46 <span>IP Address:</span> | 48 <span>IP Address:</span> |
| 47 <span>[[IPAddress]]</span> | 49 <span>[[IPAddress]]</span> |
| 48 </div> | 50 </div> |
| 49 <span hidden$="[[!showShared_(networkProperties)]]"> | 51 <span hidden$="[[!showShared_(networkProperties)]]"> |
| 50 This network is shared with other users. | 52 This network is shared with other users. |
| 51 </span> | 53 </span> |
| 52 <div class="layout horizontal center" | 54 <div class="control layout horizontal center" |
|
michaelpg
2015/10/07 18:21:07
this is two CLs in one. separate plz
stevenjb
2015/10/07 18:51:19
sure.
| |
| 53 hidden$="[[!showPreferNetwork_(networkProperties)]]"> | 55 hidden$="[[!showPreferNetwork_(networkProperties)]]"> |
| 54 <paper-icon-button id="preferButton" | 56 <paper-icon-button id="preferButton" toggles |
| 55 toggles active="{{preferNetwork}}" | 57 active="{{preferNetwork}}" |
| 58 disabled= | |
| 59 "[[isNetworkPolicyEnforced(networkProperties.Priority)]]" | |
| 56 icon="[[getPreferredIcon_(preferNetwork)]]"> | 60 icon="[[getPreferredIcon_(preferNetwork)]]"> |
| 57 </paper-icon-button> | 61 </paper-icon-button> |
| 58 <span>Prefer this network</span> | 62 <span>Prefer this network</span> |
| 63 <cr-policy-network-indicator | |
| 64 property="[[networkProperties.Priority]]"> | |
| 65 </cr-policy-network-indicator> | |
| 59 </div> | 66 </div> |
| 60 <paper-checkbox checked="{{autoConnect}}" | 67 <div class="control layout horizontal center" |
| 61 hidden$="[[!showAutoConnect_(networkProperties)]]"> | 68 hidden$="[[!showAutoConnect_(networkProperties)]]"> |
| 62 Automatically connect to this network | 69 <paper-checkbox checked="{{autoConnect}}"> |
| 63 </paper-checkbox> | 70 Automatically connect to this network |
| 71 </paper-checkbox> | |
| 72 <cr-policy-network-indicator | |
| 73 property="[[getManagedAutoConnect_(networkProperties)]]"> | |
| 74 </cr-policy-network-indicator> | |
| 75 </div> | |
| 64 | 76 |
| 65 <!-- Properties to always show if present. --> | 77 <!-- Properties to always show if present. --> |
| 66 <network-property-list | 78 <network-property-list |
| 67 fields="[[getInfoFields_(networkProperties)]]" | 79 fields="[[getInfoFields_(networkProperties)]]" |
| 68 property-dict="[[networkProperties]]"> | 80 property-dict="[[networkProperties]]"> |
| 69 </network-property-list> | 81 </network-property-list> |
| 70 </div> | 82 </div> |
| 71 | 83 |
| 72 <!-- Button row: Advanced + Disconnect | Connect. --> | 84 <!-- Button row: Advanced + Disconnect | Connect. --> |
| 73 <div class="layout horizontal center"> | 85 <div class="layout horizontal center"> |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 <!-- TODO(stevenjb): Cellular SIM --> | 174 <!-- TODO(stevenjb): Cellular SIM --> |
| 163 </cr-collapse> | 175 </cr-collapse> |
| 164 </div> | 176 </div> |
| 165 </cr-collapse> | 177 </cr-collapse> |
| 166 </div> | 178 </div> |
| 167 </div> | 179 </div> |
| 168 </div> | 180 </div> |
| 169 </template> | 181 </template> |
| 170 <script src="internet_detail_page.js"></script> | 182 <script src="internet_detail_page.js"></script> |
| 171 </dom-module> | 183 </dom-module> |
| OLD | NEW |