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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/chromeos/internet_detail.html

Issue 427903004: Support Managed NetworkState format dictionaries for controlled settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/options/network_property_ui_data.cc ('k') | chrome/browser/resources/options/chromeos/internet_detail.js » ('j') | chrome/browser/resources/options/chromeos/internet_detail.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="details-internet-page" class="page" hidden> 1 <div id="details-internet-page" class="page" hidden>
2 <div class="close-button"></div> 2 <div class="close-button"></div>
3 <!-- Network header --> 3 <!-- Network header -->
4 <div id="network-details-header"> 4 <div id="network-details-header">
5 <div id="network-details-title"></div> 5 <div id="network-details-title"></div>
6 <div id="network-details-subtitle"> 6 <div id="network-details-subtitle">
7 <span id="network-details-subtitle-status"></span> 7 <span id="network-details-subtitle-status"></span>
8 <span id="network-details-subtitle-separator"> - </span> 8 <span id="network-details-subtitle-separator"> - </span>
9 <span id="network-details-subtitle-type"></span> 9 <span id="network-details-subtitle-type"></span>
10 </div> 10 </div>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 <tr class="auto-connect-network"> 85 <tr class="auto-connect-network">
86 <td> 86 <td>
87 <div class="checkbox"> 87 <div class="checkbox">
88 <span class="controlled-setting-with-label"> 88 <span class="controlled-setting-with-label">
89 <input id="auto-connect-network-wifi" type="checkbox"> 89 <input id="auto-connect-network-wifi" type="checkbox">
90 <span> 90 <span>
91 <label for="auto-connect-network-wifi" 91 <label for="auto-connect-network-wifi"
92 i18n-content="inetAutoConnectNetwork"> 92 i18n-content="inetAutoConnectNetwork">
93 </label> 93 </label>
94 <span class="controlled-setting-indicator" 94 <span class="controlled-setting-indicator"
95 data="autoConnect" for="auto-connect-network-wifi"> 95 managed="AutoConnect" for="auto-connect-network-wifi">
96 </span> 96 </span>
97 </span> 97 </span>
98 </span> 98 </span>
99 </div> 99 </div>
100 </td> 100 </td>
101 </tr> 101 </tr>
102 </table> 102 </table>
103 </section> 103 </section>
104 <section> 104 <section>
105 <table id="wifi-settings-table"> 105 <table id="wifi-settings-table">
106 <tr> 106 <tr>
107 <td class="option-name" i18n-content="connectionState"></td> 107 <td class="option-name" i18n-content="connectionState"></td>
108 <td id="wifi-connection-state" class="option-value"></td> 108 <td id="wifi-connection-state" class="option-value"></td>
109 <tr> 109 <tr>
110 <td class="option-name" i18n-content="inetSsid"></td> 110 <td class="option-name" i18n-content="inetSsid"></td>
111 <td id="wifi-ssid" class="option-value"></td> 111 <td id="wifi-ssid" class="option-value"></td>
112 </tr> 112 </tr>
113 <tr id="wifi-bssid-entry"> 113 <tr id="wifi-bssid-entry">
114 <td class="option-name" i18n-content="inetBssid"></td> 114 <td class="option-name" i18n-content="inetBssid"></td>
115 <td id="wifi-bssid" class="option-value"></td> 115 <td id="wifi-bssid" class="option-value"></td>
116 </tr> 116 </tr>
117 <tr class="wifi-network-setting">
118 <td class="option-name" i18n-content="inetAddress"></td>
119 <td id="wifi-ip-address" class="option-value"></td>
120 </tr>
121 <tr class="wifi-network-setting">
122 <td class="option-name" i18n-content="inetNetmask"></td>
123 <td id="wifi-netmask" class="option-value"></td>
124 </tr>
125 <tr class="wifi-network-setting">
126 <td class="option-name" i18n-content="inetGateway"></td>
127 <td id="wifi-gateway" class="option-value"></td>
128 </tr>
129 <tr class="wifi-network-setting">
130 <td class="option-name" i18n-content="inetNameServers"></td>
131 <td id="wifi-name-servers" class="option-value"></td>
132 </tr>
stevenjb 2014/07/29 23:21:11 These are unused; they are logically always hidden
133 <tr id="wifi-security-entry"> 117 <tr id="wifi-security-entry">
134 <td class="options-name" i18n-content="inetEncryption"></td> 118 <td class="options-name" i18n-content="inetEncryption"></td>
135 <td id="wifi-security" class="option-value"></td> 119 <td id="wifi-security" class="option-value"></td>
136 </tr> 120 </tr>
137 <tr> 121 <tr>
138 <td class="options-name" i18n-content="inetFrequency"></td> 122 <td class="options-name" i18n-content="inetFrequency"></td>
139 <td id="wifi-frequency" class="option-value"></td> 123 <td id="wifi-frequency" class="option-value"></td>
140 </tr> 124 </tr>
141 <tr> 125 <tr>
142 <td class="options-name" i18n-content="inetSignalStrength"></td> 126 <td class="options-name" i18n-content="inetSignalStrength"></td>
(...skipping 26 matching lines...) Expand all
169 <tr class="auto-connect-network"> 153 <tr class="auto-connect-network">
170 <td> 154 <td>
171 <div class="checkbox"> 155 <div class="checkbox">
172 <span class="controlled-setting-with-label"> 156 <span class="controlled-setting-with-label">
173 <input id="auto-connect-network-wimax" type="checkbox"> 157 <input id="auto-connect-network-wimax" type="checkbox">
174 <span> 158 <span>
175 <label for="auto-connect-network-wimax" 159 <label for="auto-connect-network-wimax"
176 i18n-content="inetAutoConnectNetwork"> 160 i18n-content="inetAutoConnectNetwork">
177 </label> 161 </label>
178 <span class="controlled-setting-indicator" 162 <span class="controlled-setting-indicator"
179 data="autoConnect" for="auto-connect-network-wimax"> 163 managed="AutoConnect" for="auto-connect-network-wimax">
180 </span> 164 </span>
181 </span> 165 </span>
182 </span> 166 </span>
183 </div> 167 </div>
184 </td> 168 </td>
185 </tr> 169 </tr>
186 </table> 170 </table>
187 </section> 171 </section>
188 <section> 172 <section>
189 <table id="wimax-settings-table"> 173 <table id="wimax-settings-table">
(...skipping 27 matching lines...) Expand all
217 <tr class="auto-connect-network"> 201 <tr class="auto-connect-network">
218 <td> 202 <td>
219 <div class="checkbox"> 203 <div class="checkbox">
220 <span class="controlled-setting-with-label"> 204 <span class="controlled-setting-with-label">
221 <input id="auto-connect-network-vpn" type="checkbox"> 205 <input id="auto-connect-network-vpn" type="checkbox">
222 <span> 206 <span>
223 <label for="auto-connect-network-vpn" 207 <label for="auto-connect-network-vpn"
224 i18n-content="inetAutoConnectNetwork"> 208 i18n-content="inetAutoConnectNetwork">
225 </label> 209 </label>
226 <span class="controlled-setting-indicator" 210 <span class="controlled-setting-indicator"
227 data="autoConnect" for="auto-connect-network-vpn"> 211 managed="AutoConnect" for="auto-connect-network-vpn">
228 </span> 212 </span>
229 </span> 213 </span>
230 </span> 214 </span>
231 </div> 215 </div>
232 </td> 216 </td>
233 </tr> 217 </tr>
234 <tr> 218 <tr>
235 <td class="option-name" i18n-content="inetServiceName"></td> 219 <td class="option-name" i18n-content="inetServiceName"></td>
236 <td id="inet-service-name" class="option-value"></td> 220 <td id="inet-service-name" class="option-value"></td>
237 </tr> 221 </tr>
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 <tr> 321 <tr>
338 <td colspan="2"> 322 <td colspan="2">
339 <div class="checkbox"> 323 <div class="checkbox">
340 <span class="controlled-setting-with-label"> 324 <span class="controlled-setting-with-label">
341 <input id="auto-connect-network-cellular" type="checkbox"> 325 <input id="auto-connect-network-cellular" type="checkbox">
342 <span> 326 <span>
343 <label for="auto-connect-network-cellular" 327 <label for="auto-connect-network-cellular"
344 i18n-content="inetAutoConnectNetwork"> 328 i18n-content="inetAutoConnectNetwork">
345 </label> 329 </label>
346 <span class="controlled-setting-indicator" 330 <span class="controlled-setting-indicator"
347 data="autoConnect" for="auto-connect-network-cellular"> 331 managed="AutoConnect"
332 for="auto-connect-network-cellular">
348 </span> 333 </span>
349 </span> 334 </span>
350 </span> 335 </span>
351 </div> 336 </div>
352 </td> 337 </td>
353 </tr> 338 </tr>
354 </table> 339 </table>
355 </section> 340 </section>
356 </div> 341 </div>
357 <div id="cellular-device-tab" class="subpages-tab-contents 342 <div id="cellular-device-tab" class="subpages-tab-contents
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 </button> 684 </button>
700 <button id="details-internet-configure" i18n-content="configureButton"> 685 <button id="details-internet-configure" i18n-content="configureButton">
701 </button> 686 </button>
702 <button id="activate-details" i18n-content="activateButton"></button> 687 <button id="activate-details" i18n-content="activateButton"></button>
703 <button id="buyplan-details" i18n-content="buyplanButton"></button> 688 <button id="buyplan-details" i18n-content="buyplanButton"></button>
704 <button id="view-account-details" i18n-content="viewAccountButton"> 689 <button id="view-account-details" i18n-content="viewAccountButton">
705 </button> 690 </button>
706 </div> 691 </div>
707 </div> 692 </div>
708 </div> 693 </div>
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_property_ui_data.cc ('k') | chrome/browser/resources/options/chromeos/internet_detail.js » ('j') | chrome/browser/resources/options/chromeos/internet_detail.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698