Chromium Code Reviews| Index: chrome/browser/resources/options/browser_options.html |
| diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html |
| index 0cab9b58014e03c9337f0be0521229e73a27e408..97c329a32010d5223b38204088e5aec66a559fcd 100644 |
| --- a/chrome/browser/resources/options/browser_options.html |
| +++ b/chrome/browser/resources/options/browser_options.html |
| @@ -310,20 +310,57 @@ |
| </span> |
| </span> |
| </div> |
| - <div class="checkbox" guest-visibility="disabled"> |
| + <div id="networkPredictionOptionsBoolDiv" class="checkbox" |
| + guest-visibility="disabled"> |
| <span class="controlled-setting-with-label"> |
| - <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled" |
| - metric="Options_DnsPrefetchCheckbox" type="checkbox"> |
| + <input id="networkPredictionOptionsBool" |
| + metric="Options_NetworkPredictionOptionsBool" type="checkbox"> |
| <span> |
| - <label for="dnsPrefetchingEnabled" |
| - i18n-content="networkPredictionEnabledDescription"> |
| + <label for="networkPredictionOptionsBool" |
| + i18n-content="networkPredictionOptionsCheckboxDescription"> |
| </label> |
| <span class="controlled-setting-indicator" |
| - pref="dns_prefetching.enabled"> |
| + pref="net.network_prediction_options"> |
| </span> |
| </span> |
| </span> |
| </div> |
| + <div id="networkPredictionOptionsTristateDiv" guest-visibility="disabled"> |
| + <label for="networkPredictionOptionsTristate" class="settings-row" |
| + i18n-content="networkPredictionOptionsDropdownDescription"> |
| + </label> |
| + <div class="settings-row"> |
| + <select id="networkPredictionOptionsTristate" |
| + metric="Options_NetworkPredictionOptionsTristate"> |
| + <option value="0" i18n-content="networkPredictionOptionsAlways"> |
| + </option> |
| + <option value="1" i18n-content="networkPredictionOptionsWifiOnly"> |
| + </option> |
| + <option value="2" i18n-content="networkPredictionOptionsNever"> |
| + </option> |
| + </select> |
| + <span class="controlled-setting-indicator" |
| + pref="net.network_prediction_options"> |
| + </span> |
| + </div> |
| + </div> |
| + <!-- div class="settings-row" guest-visibility="disabled"> |
| + <label id="network-prediction-enabled-tristate-label"> |
| + <span i18n-content="networkPredictionOptionsDropdownDescription"></span> |
| + <select id="networkPredictionOptionsTristate" |
| + pref="net.network_prediction_options"> |
| + <option value="0" i18n-content="networkPredictionOptionsAlways"> |
| + </option> |
| + <option value="1" i18n-content="networkPredictionOptionsWifiOnly"> |
| + </option> |
| + <option value="2" i18n-content="networkPredictionOptionsNever"> |
| + </option> |
| + </select> |
| + <span class="controlled-setting-indicator" |
| + pref="net.network_prediction_options"> |
| + </span> |
| + </label> |
| + </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
|
| <div class="checkbox"> |
| <span class="controlled-setting-with-label"> |
| <input id="safe-browsing-extended-reporting-enabled" |