OLD | NEW |
---|---|
1 <div id="settings" class="page" hidden> | 1 <div id="settings" class="page" hidden> |
2 <header> | 2 <header> |
3 <h1 i18n-content="settingsTitle"></h1> | 3 <h1 i18n-content="settingsTitle"></h1> |
4 </header> | 4 </header> |
5 <include src="reset_profile_settings_banner.html"> | 5 <include src="reset_profile_settings_banner.html"> |
6 <include src="automatic_settings_reset_banner.html"> | 6 <include src="automatic_settings_reset_banner.html"> |
7 <if expr="chromeos"> | 7 <if expr="chromeos"> |
8 <include src="secondary_user_banner.html"> | 8 <include src="secondary_user_banner.html"> |
9 <section> | 9 <section> |
10 <div id="network-section-header" class="section-header"> | 10 <div id="network-section-header" class="section-header"> |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
303 metric="Options_UseSuggestCheckbox" type="checkbox"> | 303 metric="Options_UseSuggestCheckbox" type="checkbox"> |
304 <span> | 304 <span> |
305 <label for="searchSuggestEnabled" i18n-content="suggestPref"> | 305 <label for="searchSuggestEnabled" i18n-content="suggestPref"> |
306 </label> | 306 </label> |
307 <span class="controlled-setting-indicator" | 307 <span class="controlled-setting-indicator" |
308 pref="search.suggest_enabled"> | 308 pref="search.suggest_enabled"> |
309 </span> | 309 </span> |
310 </span> | 310 </span> |
311 </span> | 311 </span> |
312 </div> | 312 </div> |
313 <div class="checkbox" guest-visibility="disabled"> | 313 <div id="networkPredictionOptionsBoolDiv" class="checkbox" |
314 guest-visibility="disabled"> | |
314 <span class="controlled-setting-with-label"> | 315 <span class="controlled-setting-with-label"> |
315 <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled" | 316 <input id="networkPredictionOptionsBool" |
316 metric="Options_DnsPrefetchCheckbox" type="checkbox"> | 317 metric="Options_NetworkPredictionOptionsBool" type="checkbox"> |
317 <span> | 318 <span> |
318 <label for="dnsPrefetchingEnabled" | 319 <label for="networkPredictionOptionsBool" |
319 i18n-content="networkPredictionEnabledDescription"> | 320 i18n-content="networkPredictionOptionsCheckboxDescription"> |
320 </label> | 321 </label> |
321 <span class="controlled-setting-indicator" | 322 <span class="controlled-setting-indicator" |
322 pref="dns_prefetching.enabled"> | 323 pref="net.network_prediction_options"> |
323 </span> | 324 </span> |
324 </span> | 325 </span> |
325 </span> | 326 </span> |
326 </div> | 327 </div> |
328 <div id="networkPredictionOptionsTristateDiv" guest-visibility="disabled"> | |
329 <label for="networkPredictionOptionsTristate" class="settings-row" | |
330 i18n-content="networkPredictionOptionsDropdownDescription"> | |
331 </label> | |
332 <div class="settings-row"> | |
333 <select id="networkPredictionOptionsTristate" | |
334 metric="Options_NetworkPredictionOptionsTristate"> | |
335 <option value="0" i18n-content="networkPredictionOptionsAlways"> | |
336 </option> | |
337 <option value="1" i18n-content="networkPredictionOptionsWifiOnly"> | |
338 </option> | |
339 <option value="2" i18n-content="networkPredictionOptionsNever"> | |
340 </option> | |
341 </select> | |
342 <span class="controlled-setting-indicator" | |
343 pref="net.network_prediction_options"> | |
344 </span> | |
345 </div> | |
346 </div> | |
347 <!-- div class="settings-row" guest-visibility="disabled"> | |
348 <label id="network-prediction-enabled-tristate-label"> | |
349 <span i18n-content="networkPredictionOptionsDropdownDescription"></spa n> | |
350 <select id="networkPredictionOptionsTristate" | |
351 pref="net.network_prediction_options"> | |
352 <option value="0" i18n-content="networkPredictionOptionsAlways"> | |
353 </option> | |
354 <option value="1" i18n-content="networkPredictionOptionsWifiOnly"> | |
355 </option> | |
356 <option value="2" i18n-content="networkPredictionOptionsNever"> | |
357 </option> | |
358 </select> | |
359 <span class="controlled-setting-indicator" | |
360 pref="net.network_prediction_options"> | |
361 </span> | |
362 </label> | |
363 </div --> | |
stevenjb
2014/07/30 18:03:28
Elim commented out code before committing.
Bence
2014/08/01 14:36:46
Moot: UI folks told us to get rid of dropdown men
| |
327 <div class="checkbox"> | 364 <div class="checkbox"> |
328 <span class="controlled-setting-with-label"> | 365 <span class="controlled-setting-with-label"> |
329 <input id="safe-browsing-extended-reporting-enabled" | 366 <input id="safe-browsing-extended-reporting-enabled" |
330 metric="Options_SafeBrowsingExtendedReportingCheckbox" | 367 metric="Options_SafeBrowsingExtendedReportingCheckbox" |
331 pref="safebrowsing.extended_reporting_enabled" | 368 pref="safebrowsing.extended_reporting_enabled" |
332 type="checkbox"> | 369 type="checkbox"> |
333 <span> | 370 <span> |
334 <label for="safe-browsing-extended-reporting-enabled" | 371 <label for="safe-browsing-extended-reporting-enabled" |
335 i18n-content="safeBrowsingEnableExtendedReporting"> | 372 i18n-content="safeBrowsingEnableExtendedReporting"> |
336 </label> | 373 </label> |
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
954 </div> | 991 </div> |
955 </section> | 992 </section> |
956 </div> <!-- advanced-settings-container --> | 993 </div> <!-- advanced-settings-container --> |
957 </div> <!-- advanced-settings --> | 994 </div> <!-- advanced-settings --> |
958 <footer> | 995 <footer> |
959 <button id="advanced-settings-expander" class="link-button" | 996 <button id="advanced-settings-expander" class="link-button" |
960 i18n-content="showAdvancedSettings"> | 997 i18n-content="showAdvancedSettings"> |
961 </button> | 998 </button> |
962 </footer> | 999 </footer> |
963 </div> | 1000 </div> |
OLD | NEW |