Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_subpage.html

Issue 2913323003: Settings: Network: Merge Tether networks into Mobile subpage (Closed)
Patch Set: Rebase Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/paper-icon-button/paper -icon-button.html">
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
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 <paper-icon-button id="addButton" icon="settings:add-wifi"
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 </paper-icon-button>
63 <paper-toggle-button id="deviceEnabledButton" 63 <paper-toggle-button id="deviceEnabledButton"
64 aria-label$="[[getToggleA11yString_(deviceState)]]" 64 aria-label$="[[getToggleA11yString_(deviceState)]]"
65 checked="[[deviceIsEnabled_(deviceState)]]" 65 checked="[[deviceIsEnabled_(deviceState)]]"
66 enabled="[[enableToggleIsEnabled_(deviceState)]]" 66 enabled="[[enableToggleIsEnabled_(deviceState)]]"
67 on-tap="onDeviceEnabledTap_"> 67 on-tap="onDeviceEnabledTap_">
68 </paper-toggle-button> 68 </paper-toggle-button>
69 </div> 69 </div>
70 </template> 70 </template>
71 71
72 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]"> 72 <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]">
73 <div actionable class="settings-box" on-tap="onKnownNetworksTap_"> 73 <div actionable class="settings-box" on-tap="onKnownNetworksTap_">
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 on-selected="onNetworkSelected_"> 117 on-selected="onNetworkSelected_">
118 </cr-network-list> 118 </cr-network-list>
119 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" 119 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
120 class="no-networks"> 120 class="no-networks">
121 $i18n{internetNoNetworks} 121 $i18n{internetNoNetworks}
122 </div> 122 </div>
123 </template> 123 </template>
124 </template> 124 </template>
125 </div> 125 </div>
126 126
127 <template is="dom-if"
128 if="[[tetherToggleIsVisible_(deviceState, tetherDeviceState)]]">
129 <div class="settings-box two-line">
130 <div class="start">
131 $i18n{internetToggleTetherLabel}
132 <div id="tetherSecondary" class="secondary">
133 $i18n{internetToggleTetherSubtext}
134 </div>
135 </div>
136 <paper-toggle-button id="tetherEnabledButton"
137 aria-label="$i18n{internetToggleTetherLabel}"
138 aria-describedby="tetherSecondary"
Kyle Horimoto 2017/06/01 20:15:21 Just making sure: this property makes it so that t
stevenjb 2017/06/01 21:55:03 No, this is for accessibility. I need to add 'on-t
139 checked="[[deviceIsEnabled_(tetherDeviceState)]]"
140 enabled="[[enableToggleIsEnabled_(tetherDeviceState)]]"
141 on-tap="onTetherEnabledTap_">
142 </paper-toggle-button>
143 </div>
144 </template>
127 </template> 145 </template>
128 146
129 </template> 147 </template>
130 <script src="internet_subpage.js"></script> 148 <script src="internet_subpage.js"></script>
131 </dom-module> 149 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698