Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| 9 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 #networkList { | 34 #networkList { |
| 35 margin: 5px 0 10px; | 35 margin: 5px 0 10px; |
| 36 max-height: 400px; | 36 max-height: 400px; |
| 37 } | 37 } |
| 38 </style> | 38 </style> |
| 39 <div class="settings-box two-line"> | 39 <div class="settings-box two-line"> |
| 40 <div id="details" actionable class="start layout horizontal center" | 40 <div id="details" actionable class="start layout horizontal center" |
| 41 on-tap="onDetailsTap_"> | 41 on-tap="onDetailsTap_"> |
| 42 <cr-network-list-item class="flex" item="[[activeNetworkState]]"> | 42 <cr-network-list-item class="flex" item="[[activeNetworkState]]"> |
| 43 </cr-network-list-item> | 43 </cr-network-list-item> |
| 44 <paper-spinner active="[[showScanning_(deviceState, expanded)]]"> | 44 <paper-spinner active="[[showScanning_(deviceState, expanded_)]]"> |
| 45 </paper-spinner> | 45 </paper-spinner> |
| 46 </div> | 46 </div> |
| 47 <div> | 47 <div> |
| 48 <div id="buttons" class="layout horizontal"> | 48 <div id="buttons" class="layout horizontal"> |
| 49 <template is="dom-if" | 49 <template is="dom-if" |
| 50 if="[[expandIsVisible_(deviceState, networkStateList)]]"> | 50 if="[[expandIsVisible_(deviceState, networkStateList)]]"> |
| 51 <cr-expand-button id="expandListButton" expanded="{{expanded}}"> | 51 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> |
| 52 </cr-expand-button> | 52 </cr-expand-button> |
| 53 </template> | 53 </template> |
| 54 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> | 54 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> |
| 55 <paper-toggle-button id="deviceEnabledButton" | 55 <paper-toggle-button id="deviceEnabledButton" |
| 56 checked="[[deviceIsEnabled_(deviceState)]]" | 56 checked="[[deviceIsEnabled_(deviceState)]]" |
| 57 on-tap="onDeviceEnabledTap_"> | 57 on-tap="onDeviceEnabledTap_"> |
| 58 </paper-toggle-button> | 58 </paper-toggle-button> |
| 59 </template> | 59 </template> |
| 60 </div> | 60 </div> |
| 61 </div> | 61 </div> |
| 62 </div> | 62 </div> |
| 63 <template is="dom-if" if="[[networksDomIfIsTrue_(expanded, wasExpanded)]]"> | 63 <template is="dom-if" if="[[networksDomIfIsTrue_(expanded_, wasExpanded_)]]" > |
|
Dan Beam
2016/08/31 21:59:47
wrap
stevenjb
2016/08/31 22:10:17
Done.
| |
| 64 <iron-collapse | 64 <iron-collapse |
| 65 opened="[[networksIronCollapseIsOpened_(expanded, wasExpanded)]]"> | 65 opened="[[networksIronCollapseIsOpened_(expanded_, wasExpanded_)]]"> |
| 66 <div class="list-frame"> | 66 <div class="list-frame"> |
| 67 <cr-network-list id="networkList" max-height="[[maxHeight]]" | 67 <cr-network-list id="networkList" max-height="[[maxHeight]]" |
| 68 networks="[[networkStateList]]" show-buttons> | 68 networks="[[networkStateList]]" show-buttons> |
| 69 </cr-network-list> | 69 </cr-network-list> |
| 70 <template is="dom-if" | 70 <template is="dom-if" |
| 71 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> | 71 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> |
| 72 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> | 72 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> |
| 73 <a is="action-link">$i18n{knownNetworksButton}</a> | 73 <a is="action-link">$i18n{knownNetworksButton}</a> |
| 74 </div> | 74 </div> |
| 75 </template> | 75 </template> |
| 76 </div> | 76 </div> |
| 77 </iron-collapse> | 77 </iron-collapse> |
| 78 </template> | 78 </template> |
| 79 </template> | 79 </template> |
| 80 <script src="network_summary_item.js"></script> | 80 <script src="network_summary_item.js"></script> |
| 81 </dom-module> | 81 </dom-module> |
| OLD | NEW |