| Index: chrome/browser/resources/options/advanced_options.html
|
| diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
|
| index eeec8f796c36a39a58a4cff99b4cfff44b9df425..e20d988cc9928d1433588a5006df0cfcaa149b86 100644
|
| --- a/chrome/browser/resources/options/advanced_options.html
|
| +++ b/chrome/browser/resources/options/advanced_options.html
|
| @@ -2,164 +2,115 @@
|
| <h1 i18n-content="advancedPage"></h1>
|
| <section>
|
| <h3 i18n-content="advancedSectionTitlePrivacy"></h3>
|
| - <table class="option-control-table">
|
| - <tr><td>
|
| + <div>
|
| + <div>
|
| <button id="privacyContentSettingsButton"
|
| i18n-content="privacyContentSettingsButton"></button>
|
| <button id="privacyClearDataButton"
|
| i18n-content="privacyClearDataButton"></button>
|
| - </td></tr>
|
| - <tr><td>
|
| - <div class="section-text"
|
| - i18n-content="disableServices"></div>
|
| - <div id="privacyLearnMore">
|
| - <a target="_blank" i18n-content="privacyLearnMoreLabel"
|
| - i18n-values="href:privacyLearnMoreURL"></a></div>
|
| - </td></tr>
|
| - <tr id="linkDoctorCheckbox">
|
| - <td class="option-name"><label><input id="alternateErrorPagesEnabled"
|
| - pref="alternate_error_pages.enabled" type="checkbox"><span
|
| - i18n-content="linkDoctorPref"></span></label></td>
|
| - </tr>
|
| - <tr id="suggestCheckbox">
|
| - <td class="option-name"><label><input id="searchSuggestEnabled"
|
| - pref="search.suggest_enabled" type="checkbox"><span
|
| - i18n-content="suggestPref"></span></label></td>
|
| - </tr>
|
| - <tr id="dnsPrefetchingCheckbox">
|
| - <td class="option-name"><label><input id="dnsPrefetchingEnabled"
|
| - pref="dns_prefetching.enabled" type="checkbox"><span
|
| - i18n-content="networkDNSPrefetchEnabledDescription"></span></label>
|
| - </td>
|
| - </tr>
|
| - <tr id="safeBrowsingCheckbox">
|
| - <td class="option-name"><label><input id="safeBrowsingEnabled"
|
| - pref="safebrowsing.enabled" type="checkbox"><span
|
| - i18n-content="safeBrowsingEnableProtection"></span></label></td>
|
| - </tr>
|
| + </div>
|
| + <div i18n-content="disableServices"></div>
|
| + <div><a target="_blank" i18n-content="privacyLearnMoreLabel"
|
| + i18n-values="href:privacyLearnMoreURL"></a></div>
|
| + <label><input id="alternateErrorPagesEnabled"
|
| + pref="alternate_error_pages.enabled" type="checkbox"><span
|
| + i18n-content="linkDoctorPref"></span></label>
|
| + <label><input id="searchSuggestEnabled"
|
| + pref="search.suggest_enabled" type="checkbox"><span
|
| + i18n-content="suggestPref"></span></label>
|
| + <label><input id="dnsPrefetchingEnabled"
|
| + pref="dns_prefetching.enabled" type="checkbox"><span
|
| + i18n-content="networkDNSPrefetchEnabledDescription"></span>
|
| + </label>
|
| + <label><input id="safeBrowsingEnabled"
|
| + pref="safebrowsing.enabled" type="checkbox"><span
|
| + i18n-content="safeBrowsingEnableProtection"></span></label>
|
| <if expr="pp_ifdef('_google_chrome')">
|
| - <tr id="metricsReportingCheckbox">
|
| - <td class="option-name"><label><input id="metricsReportingEnabled"
|
| - pref="user_experience_metrics.reporting_enabled" type="checkbox">
|
| - <span i18n-content="enableLogging"></span></label></td>
|
| - </tr>
|
| + <label><input id="metricsReportingEnabled"
|
| + pref="user_experience_metrics.reporting_enabled" type="checkbox">
|
| + <span i18n-content="enableLogging"></span></label>
|
| </if>
|
| - </table>
|
| + </div>
|
| </section>
|
| <if expr="not pp_ifdef('chromeos')">
|
| <section>
|
| <h3 i18n-content="advancedSectionTitleNetwork"></h3>
|
| - <table class="option-control-table">
|
| - <tr><td>
|
| - <div class="section-text"
|
| - i18n-content="proxiesLabel"></div>
|
| - </td></tr>
|
| - <tr><td>
|
| - <button id="proxiesConfigureButton"
|
| - i18n-content="proxiesConfigureButton"></button>
|
| - </td></tr>
|
| - </table>
|
| + <div>
|
| + <div i18n-content="proxiesLabel"></div>
|
| + <button id="proxiesConfigureButton"
|
| + i18n-content="proxiesConfigureButton"></button>
|
| + </div>
|
| </section>
|
| </if>
|
| <section>
|
| <h3 i18n-content="advancedSectionTitleTranslate"></h3>
|
| - <table class="option-control-table">
|
| - <tr id="enableTranslateCheckbox">
|
| - <td class="option-name"><label><input id="enableTranslate"
|
| - pref="translate.enabled" type="checkbox"><span
|
| - i18n-content="translateEnableTranslate"></span></label></td>
|
| - </tr>
|
| - </table>
|
| + <div>
|
| + <label><input id="enableTranslate"
|
| + pref="translate.enabled" type="checkbox"><span
|
| + i18n-content="translateEnableTranslate"></span></label>
|
| + </div>
|
| </section>
|
| <section>
|
| <h3 i18n-content="downloadLocationGroupName"></h3>
|
| - <table class="option-control-table">
|
| - <tr><td>
|
| - <div class="section_text"
|
| - i18n-content="downloadLocationBrowseTitle"></div>
|
| - <input id="downloadLocationPath" type="text" size="60" disabled>
|
| - <button id="downloadLocationBrowseButton"
|
| - i18n-content="downloadLocationBrowseButton"></button>
|
| - </td></tr>
|
| - <tr id="promptForDownloadCheckbox">
|
| - <td class="option-name"><label><input id="promptForDownload"
|
| - pref="download.prompt_for_download" type="checkbox"><span
|
| - i18n-content="downloadLocationAskForSaveLocation"></span></label>
|
| - </td>
|
| - </tr>
|
| - <tr><td>
|
| - <div class="section-text"
|
| - i18n-content="autoOpenFileTypesInfo"></div>
|
| - <button id="autoOpenFileTypesResetToDefault"
|
| - i18n-content="autoOpenFileTypesResetToDefault"></button>
|
| - </td></tr>
|
| - </table>
|
| + <div>
|
| + <div i18n-content="downloadLocationBrowseTitle"></div>
|
| + <div><input id="downloadLocationPath" type="text" size="60" disabled></div>
|
| + <div><button id="downloadLocationBrowseButton"
|
| + i18n-content="downloadLocationBrowseButton"></button></div>
|
| + <label><input id="promptForDownload"
|
| + pref="download.prompt_for_download" type="checkbox"><span
|
| + i18n-content="downloadLocationAskForSaveLocation"></span></label>
|
| + <div i18n-content="autoOpenFileTypesInfo"></div>
|
| + <div><button id="autoOpenFileTypesResetToDefault"
|
| + i18n-content="autoOpenFileTypesResetToDefault"></button></div>
|
| + </div>
|
| </section>
|
| <section>
|
| <h3 i18n-content="advancedSectionTitleContent"></h3>
|
| - <table class="option-control-table">
|
| + <div>
|
| <if expr="os == 'darwin'">
|
| - <tr id="tabsToLinksCheckbox">
|
| - <td class="option-name"><label><input id="tabsToLinksPref"
|
| - pref="webkit.webprefs.tabs_to_links" type="checkbox"><span
|
| - i18n-content="tabsToLinksPref"></span></label></td>
|
| - </tr>
|
| + <label><input id="tabsToLinksPref"
|
| + pref="webkit.webprefs.tabs_to_links" type="checkbox"><span
|
| + i18n-content="tabsToLinksPref"></span></label>
|
| </if>
|
| - <tr id="fontSettingsConfigureFontsOnlyButton"><td>
|
| - <button id="fontSettingsConfigureFontsOnlyButton"
|
| - i18n-content="fontSettingsConfigureFontsOnlyButton"></button>
|
| - </td></tr>
|
| - </table>
|
| + <div><button id="fontSettingsConfigureFontsOnlyButton"
|
| + i18n-content="fontSettingsConfigureFontsOnlyButton"></button></div>
|
| + </div>
|
| </section>
|
| <if expr="not pp_ifdef('chromeos')">
|
| <section>
|
| <h3 i18n-content="advancedSectionTitleSecurity"></h3>
|
| - <table class="option-control-table">
|
| - <tr><td>
|
| - <div class="section_text"
|
| - i18n-content="certificatesLabel"></div>
|
| - <button id="certificatesManageButton"
|
| - i18n-content="certificatesManageButton"></button>
|
| - </td></tr>
|
| + <div>
|
| + <div i18n-content="certificatesLabel"></div>
|
| + <div><button id="certificatesManageButton"
|
| + i18n-content="certificatesManageButton"></button></div>
|
| </if>
|
| <if expr="os == 'win32'">
|
| <!-- Configure these options for manual handling on windows -->
|
| - <tr id="sslCheckRevocationCheckbox">
|
| - <td class="option-name"><label><input id="sslCheckRevocation"
|
| - type="checkbox"><span i18n-content="sslCheckRevocation"></span>
|
| - </label></td>
|
| - </tr>
|
| - <tr id="sslUseSSL2Checkbox">
|
| - <td class="option-name"><label><input id="sslUseSSL2"
|
| - type="checkbox"><span i18n-content="sslUseSSL2"></span>
|
| - </label></td>
|
| - </tr>
|
| + <label><input id="sslCheckRevocation"
|
| + type="checkbox"><span i18n-content="sslCheckRevocation"></span>
|
| + </label>
|
| + <label><input id="sslUseSSL2"
|
| + type="checkbox"><span i18n-content="sslUseSSL2"></span>
|
| + </label>
|
| </if>
|
| <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)">
|
| <!-- Configure these options for Linux/BSD as preference keys -->
|
| - <tr id="sslCheckRevocationCheckbox">
|
| - <td class="option-name"><label><input id="sslCheckRevocation"
|
| - pref="ssl.rev_checking.enabled" type="checkbox"><span
|
| - i18n-content="sslCheckRevocation"></span></label></td>
|
| - </tr>
|
| - <tr id="sslUseSSL2Checkbox">
|
| - <td class="option-name"><label><input id="sslUseSSL2"
|
| - pref="ssl.ssl2.enabled" type="checkbox"><spa
|
| - i18n-content="sslUseSSL2"></span></label></td>
|
| - </tr>
|
| - <tr id="sslUseSSL3Checkbox">
|
| - <td class="option-name"><label><input id="sslUseSSL3"
|
| - pref="ssl.ssl3.enabled" type="checkbox"><span
|
| - i18n-content="sslUseSSL3"></span></label></td>
|
| - </tr>
|
| - <tr id="sslUseTLS1Checkbox">
|
| - <td class="option-name"><label><input id="sslUseTLS1"
|
| - pref="ssl.tls1.enabled" type="checkbox"><span
|
| - i18n-content="sslUseTLS1"></span></label></td>
|
| - </tr>
|
| + <label><input id="sslCheckRevocation"
|
| + pref="ssl.rev_checking.enabled" type="checkbox"><span
|
| + i18n-content="sslCheckRevocation"></span></label>
|
| + <label><input id="sslUseSSL2"
|
| + pref="ssl.ssl2.enabled" type="checkbox"><span
|
| + i18n-content="sslUseSSL2"></span></label>
|
| + <label><input id="sslUseSSL3"
|
| + pref="ssl.ssl3.enabled" type="checkbox"><span
|
| + i18n-content="sslUseSSL3"></span></label>
|
| + <label><input id="sslUseTLS1"
|
| + pref="ssl.tls1.enabled" type="checkbox"><span
|
| + i18n-content="sslUseTLS1"></span></label>
|
| </if>
|
| <if expr="not pp_ifdef('chromeos')">
|
| - </table>
|
| + </div>
|
| </section>
|
| </if>
|
| </div>
|
|
|