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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/advanced_options.html

Issue 2884047: Revert 53990 - - Implement proxy settings dialog for Linux/Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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/dom_ui/advanced_options_utils_win.cc ('k') | chrome/browser/resources/options/advanced_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div class="page hidden" id="advancedPage"> 1 <div class="page hidden" id="advancedPage">
2 <h1 i18n-content="advancedPage"></h1> 2 <h1 i18n-content="advancedPage"></h1>
3 <section> 3 <section>
4 <h3 i18n-content="advancedSectionTitlePrivacy"></h3> 4 <h3 i18n-content="advancedSectionTitlePrivacy"></h3>
5 <table class="option-control-table"> 5 <table class="option-control-table">
6 <tr><td> 6 <tr><td>
7 <button id="privacyContentSettingsButton" 7 <button id="privacyContentSettingsButton"
8 i18n-content="privacyContentSettingsButton"></button> 8 i18n-content="privacyContentSettingsButton"></button>
9 <button id="privacyClearDataButton" 9 <button id="privacyClearDataButton"
10 i18n-content="privacyClearDataButton"></button> 10 i18n-content="privacyClearDataButton"></button>
(...skipping 19 matching lines...) Expand all
30 <td class="option-name"><label><input id="dnsPrefetchingEnabled" 30 <td class="option-name"><label><input id="dnsPrefetchingEnabled"
31 pref="dns_prefetching.enabled" type="checkbox"><span 31 pref="dns_prefetching.enabled" type="checkbox"><span
32 i18n-content="networkDNSPrefetchEnabledDescription"></span></label> 32 i18n-content="networkDNSPrefetchEnabledDescription"></span></label>
33 </td> 33 </td>
34 </tr> 34 </tr>
35 <tr id="safeBrowsingCheckbox"> 35 <tr id="safeBrowsingCheckbox">
36 <td class="option-name"><label><input id="safeBrowsingEnabled" 36 <td class="option-name"><label><input id="safeBrowsingEnabled"
37 pref="safebrowsing.enabled" type="checkbox"><span 37 pref="safebrowsing.enabled" type="checkbox"><span
38 i18n-content="safeBrowsingEnableProtection"></span></label></td> 38 i18n-content="safeBrowsingEnableProtection"></span></label></td>
39 </tr> 39 </tr>
40 <if expr="pp_ifdef('_google_chrome')"> 40 <if expr="pp_ifdef('_google_chrome')">
41 <tr id="metricsReportingCheckbox"> 41 <tr id="metricsReportingCheckbox">
42 <td class="option-name"><label><input id="metricsReportingEnabled" 42 <td class="option-name"><label><input id="metricsReportingEnabled"
43 pref="user_experience_metrics.reporting_enabled" type="checkbox"> 43 pref="user_experience_metrics.reporting_enabled" type="checkbox">
44 <span i18n-content="enableLogging"></span></label></td> 44 <span i18n-content="enableLogging"></span></label></td>
45 </tr> 45 </tr>
46 </if> 46 </if>
47 </table> 47 </table>
48 </section> 48 </section>
49 <if expr="not pp_ifdef('chromeos')">
50 <section> 49 <section>
51 <h3 i18n-content="advancedSectionTitleNetwork"></h3> 50 <h3 i18n-content="advancedSectionTitleNetwork"></h3>
52 <table class="option-control-table"> 51 <table class="option-control-table">
53 <tr><td> 52 <tr><td>
54 <div class="section-text" 53 <div class="section-text"
55 i18n-content="proxiesLabel"></div> 54 i18n-content="proxiesLabel"></div>
56 </td></tr> 55 </td></tr>
57 <tr><td> 56 <tr><td>
58 <button id="proxiesConfigureButton" 57 <button id="proxiesConfigureButton"
59 i18n-content="proxiesConfigureButton"></button> 58 i18n-content="proxiesConfigureButton"></button>
60 </td></tr> 59 </td></tr>
61 </table> 60 </table>
62 </section> 61 </section>
63 </if>
64 <section> 62 <section>
65 <h3 i18n-content="advancedSectionTitleTranslate"></h3> 63 <h3 i18n-content="advancedSectionTitleTranslate"></h3>
66 <table class="option-control-table"> 64 <table class="option-control-table">
67 <tr id="enableTranslateCheckbox"> 65 <tr id="enableTranslateCheckbox">
68 <td class="option-name"><label><input id="enableTranslate" 66 <td class="option-name"><label><input id="enableTranslate"
69 pref="translate.enabled" type="checkbox"><span 67 pref="translate.enabled" type="checkbox"><span
70 i18n-content="translateEnableTranslate"></span></label></td> 68 i18n-content="translateEnableTranslate"></span></label></td>
71 </tr> 69 </tr>
72 </table> 70 </table>
73 </section> 71 </section>
(...skipping 17 matching lines...) Expand all
91 <div class="section-text" 89 <div class="section-text"
92 i18n-content="autoOpenFileTypesInfo"></div> 90 i18n-content="autoOpenFileTypesInfo"></div>
93 <button id="autoOpenFileTypesResetToDefault" 91 <button id="autoOpenFileTypesResetToDefault"
94 i18n-content="autoOpenFileTypesResetToDefault"></button> 92 i18n-content="autoOpenFileTypesResetToDefault"></button>
95 </td></tr> 93 </td></tr>
96 </table> 94 </table>
97 </section> 95 </section>
98 <section> 96 <section>
99 <h3 i18n-content="advancedSectionTitleContent"></h3> 97 <h3 i18n-content="advancedSectionTitleContent"></h3>
100 <table class="option-control-table"> 98 <table class="option-control-table">
101 <if expr="os == 'darwin'"> 99 <if expr="os == 'darwin'">
102 <tr id="tabsToLinksCheckbox"> 100 <tr id="tabsToLinksCheckbox">
103 <td class="option-name"><label><input id="tabsToLinksPref" 101 <td class="option-name"><label><input id="tabsToLinksPref"
104 pref="webkit.webprefs.tabs_to_links" type="checkbox"><span 102 pref="webkit.webprefs.tabs_to_links" type="checkbox"><span
105 i18n-content="tabsToLinksPref"></span></label></td> 103 i18n-content="tabsToLinksPref"></span></label></td>
106 </tr> 104 </tr>
107 </if> 105 </if>
108 <tr id="fontSettingsConfigureFontsOnlyButton"><td> 106 <tr id="fontSettingsConfigureFontsOnlyButton"><td>
109 <button id="fontSettingsConfigureFontsOnlyButton" 107 <button id="fontSettingsConfigureFontsOnlyButton"
110 i18n-content="fontSettingsConfigureFontsOnlyButton"></button> 108 i18n-content="fontSettingsConfigureFontsOnlyButton"></button>
111 </td></tr> 109 </td></tr>
112 </table> 110 </table>
113 </section> 111 </section>
114 <if expr="not pp_ifdef('chromeos')">
115 <section> 112 <section>
116 <h3 i18n-content="advancedSectionTitleSecurity"></h3> 113 <h3 i18n-content="advancedSectionTitleSecurity"></h3>
117 <table class="option-control-table"> 114 <table class="option-control-table">
118 <tr><td> 115 <tr><td>
119 <div class="section_text" 116 <div class="section_text"
120 i18n-content="certificatesLabel"></div> 117 i18n-content="certificatesLabel"></div>
121 <button id="certificatesManageButton" 118 <button id="certificatesManageButton"
122 i18n-content="certificatesManageButton"></button> 119 i18n-content="certificatesManageButton"></button>
123 </td></tr> 120 </td></tr>
124 </if> 121 <if expr="os == 'win32'">
125 <if expr="os == 'win32'"> 122 <!-- Configure these options for manual handling on windows -->
126 <!-- Configure these options for manual handling on windows --> 123 <tr id="sslCheckRevocationCheckbox">
127 <tr id="sslCheckRevocationCheckbox"> 124 <td class="option-name"><label><input id="sslCheckRevocation"
128 <td class="option-name"><label><input id="sslCheckRevocation" 125 type="checkbox"><span i18n-content="sslCheckRevocation"></span>
129 type="checkbox"><span i18n-content="sslCheckRevocation"></span> 126 </label></td>
130 </label></td> 127 </tr>
131 </tr> 128 <tr id="sslUseSSL2Checkbox">
132 <tr id="sslUseSSL2Checkbox"> 129 <td class="option-name"><label><input id="sslUseSSL2"
133 <td class="option-name"><label><input id="sslUseSSL2" 130 type="checkbox"><span i18n-content="sslUseSSL2"></span>
134 type="checkbox"><span i18n-content="sslUseSSL2"></span> 131 </label></td>
135 </label></td> 132 </tr>
136 </tr> 133 </if>
137 </if> 134 <if expr="os == 'linux2' or os.find('bsd') != -1">
138 <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)" > 135 <!-- Configure these options for Linux/BSD as preference keys -->
139 <!-- Configure these options for Linux/BSD as preference keys --> 136 <tr id="sslCheckRevocationCheckbox">
140 <tr id="sslCheckRevocationCheckbox"> 137 <td class="option-name"><label><input id="sslCheckRevocation"
141 <td class="option-name"><label><input id="sslCheckRevocation" 138 pref="ssl.rev_checking.enabled" type="checkbox"><span
142 pref="ssl.rev_checking.enabled" type="checkbox"><span 139 i18n-content="sslCheckRevocation"></span></label></td>
143 i18n-content="sslCheckRevocation"></span></label></td> 140 </tr>
144 </tr> 141 <tr id="sslUseSSL2Checkbox">
145 <tr id="sslUseSSL2Checkbox"> 142 <td class="option-name"><label><input id="sslUseSSL2"
146 <td class="option-name"><label><input id="sslUseSSL2" 143 pref="ssl.ssl2.enabled" type="checkbox"><span
147 pref="ssl.ssl2.enabled" type="checkbox"><spa 144 i18n-content="sslUseSSL2"></span></label></td>
148 i18n-content="sslUseSSL2"></span></label></td> 145 </tr>
149 </tr> 146 <tr id="sslUseSSL3Checkbox">
150 <tr id="sslUseSSL3Checkbox"> 147 <td class="option-name"><label><input id="sslUseSSL3"
151 <td class="option-name"><label><input id="sslUseSSL3" 148 pref="ssl.ssl3.enabled" type="checkbox"><span
152 pref="ssl.ssl3.enabled" type="checkbox"><span 149 i18n-content="sslUseSSL3"></span></label></td>
153 i18n-content="sslUseSSL3"></span></label></td> 150 </tr>
154 </tr> 151 <tr id="sslUseTLS1Checkbox">
155 <tr id="sslUseTLS1Checkbox"> 152 <td class="option-name"><label><input id="sslUseTLS1"
156 <td class="option-name"><label><input id="sslUseTLS1" 153 pref="ssl.tls1.enabled" type="checkbox"><span
157 pref="ssl.tls1.enabled" type="checkbox"><span 154 i18n-content="sslUseTLS1"></span></label></td>
158 i18n-content="sslUseTLS1"></span></label></td> 155 </tr>
159 </tr> 156 </if>
160 </if>
161 <if expr="not pp_ifdef('chromeos')">
162 </table> 157 </table>
163 </section> 158 </section>
164 </if>
165 </div> 159 </div>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/advanced_options_utils_win.cc ('k') | chrome/browser/resources/options/advanced_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698