Chromium Code Reviews| 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/network/cr_network_list. html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.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/iron-icon/iron-icon.htm l"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.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 |
| 11 <dom-module id="settings-internet-subpage"> | 11 <dom-module id="settings-internet-subpage"> |
| 12 <template> | 12 <template> |
| 13 <style include="settings-shared iron-flex"> | 13 <style include="settings-shared iron-flex"> |
| 14 #networkListDiv { | 14 #networkListDiv { |
| 15 /* cr-network-list is padded to the right to allow space for a ripple */ | 15 /* cr-network-list is padded to the right to allow space for a ripple */ |
| 16 -webkit-padding-end: calc(var(--settings-box-row-padding) - | 16 -webkit-padding-end: calc(var(--settings-box-row-padding) - |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 } | 48 } |
| 49 </style> | 49 </style> |
| 50 | 50 |
| 51 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> | 51 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> |
| 52 <div class="settings-box first"> | 52 <div class="settings-box first"> |
| 53 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> | 53 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> |
| 54 [[getOffOnString_(deviceState, | 54 [[getOffOnString_(deviceState, |
| 55 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] | 55 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] |
| 56 </div> | 56 </div> |
| 57 <!-- The add button in this row is only shown for WiFi networks. --> | 57 <!-- The add button in this row is only shown for WiFi networks. --> |
| 58 <paper-icon-button id="addButton" icon="settings:add-wifi" | 58 <button is="paper-icon-button-light" id="addButton" |
| 59 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]" | 59 hidden$="[[!showAddButton_(deviceState, globalPolicy)]]" |
| 60 aria-label="$i18n{internetAddWiFi}" | 60 aria-label="$i18n{internetAddWiFi}" |
| 61 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> | 61 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> |
| 62 </paper-icon-button> | 62 <iron-icon icon="settings:add-wifi"></iron-icon> |
|
dschuyler
2017/06/07 23:21:21
Thanks for removing iron-icon in other files in th
scottchen
2017/06/08 22:13:15
Missed this one, nice catch.
| |
| 63 </button> | |
| 63 <paper-toggle-button id="deviceEnabledButton" | 64 <paper-toggle-button id="deviceEnabledButton" |
| 64 aria-label$="[[getToggleA11yString_(deviceState)]]" | 65 aria-label$="[[getToggleA11yString_(deviceState)]]" |
| 65 checked="[[deviceIsEnabled_(deviceState)]]" | 66 checked="[[deviceIsEnabled_(deviceState)]]" |
| 66 disabled="[[!enableToggleIsEnabled_(deviceState)]]" | 67 disabled="[[!enableToggleIsEnabled_(deviceState)]]" |
| 67 on-tap="onDeviceEnabledTap_"> | 68 on-tap="onDeviceEnabledTap_"> |
| 68 </paper-toggle-button> | 69 </paper-toggle-button> |
| 69 </div> | 70 </div> |
| 70 </template> | 71 </template> |
| 71 | 72 |
| 72 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]"> | 73 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]"> |
| 73 <div actionable class="settings-box" on-tap="onKnownNetworksTap_"> | 74 <div actionable class="settings-box" on-tap="onKnownNetworksTap_"> |
| 74 <div class="start">$i18n{knownNetworksButton}</div> | 75 <div class="start">$i18n{knownNetworksButton}</div> |
| 75 <button class="subpage-arrow" is="paper-icon-button-light" | 76 <button class="subpage-arrow" is="paper-icon-button-light" |
| 76 aria-label="$i18n{knownNetworksButton}"> | 77 aria-label="$i18n{knownNetworksButton}"> |
| 77 </button> | 78 </button> |
| 78 </div> | 79 </div> |
| 79 </template> | 80 </template> |
| 80 | 81 |
| 81 <template is="dom-if" if="[[deviceIsEnabled_(deviceState)]]"> | 82 <template is="dom-if" if="[[deviceIsEnabled_(deviceState)]]"> |
| 82 <div id="networkListDiv" class="layout vertical flex"> | 83 <div id="networkListDiv" class="layout vertical flex"> |
| 83 <!-- VPN only header for built-in VPNs. --> | 84 <!-- VPN only header for built-in VPNs. --> |
| 84 <div class="vpn-header layout horizontal center" | 85 <div class="vpn-header layout horizontal center" |
| 85 hidden$="[[!isEqual_('VPN', deviceState.Type)]]"> | 86 hidden$="[[!isEqual_('VPN', deviceState.Type)]]"> |
| 86 <div class="flex">$i18n{networkVpnBuiltin}</div> | 87 <div class="flex">$i18n{networkVpnBuiltin}</div> |
| 87 <paper-icon-button icon="settings:add-circle" | 88 <button is="paper-icon-button-light" |
| 88 aria-label="$i18n{internetAddVPN}" | 89 aria-label="$i18n{internetAddVPN}" |
| 89 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> | 90 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> |
| 90 </paper-icon-button> | 91 <iron-icon icon="settings:add-circle"></iron-icon> |
| 92 </button> | |
| 91 </div> | 93 </div> |
| 92 | 94 |
| 93 <!-- List of networks or 'None'. --> | 95 <!-- List of networks or 'None'. --> |
| 94 <cr-network-list id="networkList" show-buttons | 96 <cr-network-list id="networkList" show-buttons |
| 95 hidden$="[[!networkStateList_.length]]" | 97 hidden$="[[!networkStateList_.length]]" |
| 96 networks="[[networkStateList_]]" | 98 networks="[[networkStateList_]]" |
| 97 on-selected="onNetworkSelected_"> | 99 on-selected="onNetworkSelected_"> |
| 98 </cr-network-list> | 100 </cr-network-list> |
| 99 <div hidden$="[[networkStateList_.length]]" class="no-networks"> | 101 <div hidden$="[[networkStateList_.length]]" class="no-networks"> |
| 100 $i18n{internetNoNetworks} | 102 $i18n{internetNoNetworks} |
| 101 </div> | 103 </div> |
| 102 | 104 |
| 103 <!-- Third party VPNs. --> | 105 <!-- Third party VPNs. --> |
| 104 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> | 106 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> |
| 105 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]"> | 107 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]"> |
| 106 <div id="[[item.ProviderName]]" | 108 <div id="[[item.ProviderName]]" |
| 107 class="vpn-header layout horizontal center"> | 109 class="vpn-header layout horizontal center"> |
| 108 <div class="flex">[[item.ProviderName]]</div> | 110 <div class="flex">[[item.ProviderName]]</div> |
| 109 <paper-icon-button icon="settings:add-circle" | 111 <button is="paper-icon-button-light" |
| 110 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]" | 112 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]" |
| 111 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]"> | 113 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]"> |
| 112 </paper-icon-button> | 114 <iron-icon icon="settings:add-circle"></iron-icon> |
| 115 </button> | |
| 113 </div> | 116 </div> |
| 114 <cr-network-list show-buttons | 117 <cr-network-list show-buttons |
| 115 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" | 118 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" |
| 116 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]" | 119 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]" |
| 117 on-selected="onNetworkSelected_"> | 120 on-selected="onNetworkSelected_"> |
| 118 </cr-network-list> | 121 </cr-network-list> |
| 119 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" | 122 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" |
| 120 class="no-networks"> | 123 class="no-networks"> |
| 121 $i18n{internetNoNetworks} | 124 $i18n{internetNoNetworks} |
| 122 </div> | 125 </div> |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 141 disabled="[[!tetherToggleIsEnabled_(deviceState, | 144 disabled="[[!tetherToggleIsEnabled_(deviceState, |
| 142 tetherDeviceState)]]"> | 145 tetherDeviceState)]]"> |
| 143 </paper-toggle-button> | 146 </paper-toggle-button> |
| 144 </div> | 147 </div> |
| 145 </template> | 148 </template> |
| 146 </template> | 149 </template> |
| 147 | 150 |
| 148 </template> | 151 </template> |
| 149 <script src="internet_subpage.js"></script> | 152 <script src="internet_subpage.js"></script> |
| 150 </dom-module> | 153 </dom-module> |
| OLD | NEW |