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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2847061: Implement dom-ui 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')">
49 <section> 50 <section>
50 <h3 i18n-content="advancedSectionTitleNetwork"></h3> 51 <h3 i18n-content="advancedSectionTitleNetwork"></h3>
51 <table class="option-control-table"> 52 <table class="option-control-table">
52 <tr><td> 53 <tr><td>
53 <div class="section-text" 54 <div class="section-text"
54 i18n-content="proxiesLabel"></div> 55 i18n-content="proxiesLabel"></div>
55 </td></tr> 56 </td></tr>
56 <tr><td> 57 <tr><td>
57 <button id="proxiesConfigureButton" 58 <button id="proxiesConfigureButton"
58 i18n-content="proxiesConfigureButton"></button> 59 i18n-content="proxiesConfigureButton"></button>
59 </td></tr> 60 </td></tr>
60 </table> 61 </table>
61 </section> 62 </section>
63 </if>
62 <section> 64 <section>
63 <h3 i18n-content="advancedSectionTitleTranslate"></h3> 65 <h3 i18n-content="advancedSectionTitleTranslate"></h3>
64 <table class="option-control-table"> 66 <table class="option-control-table">
65 <tr id="enableTranslateCheckbox"> 67 <tr id="enableTranslateCheckbox">
66 <td class="option-name"><label><input id="enableTranslate" 68 <td class="option-name"><label><input id="enableTranslate"
67 pref="translate.enabled" type="checkbox"><span 69 pref="translate.enabled" type="checkbox"><span
68 i18n-content="translateEnableTranslate"></span></label></td> 70 i18n-content="translateEnableTranslate"></span></label></td>
69 </tr> 71 </tr>
70 </table> 72 </table>
71 </section> 73 </section>
(...skipping 17 matching lines...) Expand all
89 <div class="section-text" 91 <div class="section-text"
90 i18n-content="autoOpenFileTypesInfo"></div> 92 i18n-content="autoOpenFileTypesInfo"></div>
91 <button id="autoOpenFileTypesResetToDefault" 93 <button id="autoOpenFileTypesResetToDefault"
92 i18n-content="autoOpenFileTypesResetToDefault"></button> 94 i18n-content="autoOpenFileTypesResetToDefault"></button>
93 </td></tr> 95 </td></tr>
94 </table> 96 </table>
95 </section> 97 </section>
96 <section> 98 <section>
97 <h3 i18n-content="advancedSectionTitleContent"></h3> 99 <h3 i18n-content="advancedSectionTitleContent"></h3>
98 <table class="option-control-table"> 100 <table class="option-control-table">
99 <if expr="os == 'darwin'"> 101 <if expr="os == 'darwin'">
100 <tr id="tabsToLinksCheckbox"> 102 <tr id="tabsToLinksCheckbox">
101 <td class="option-name"><label><input id="tabsToLinksPref" 103 <td class="option-name"><label><input id="tabsToLinksPref"
102 pref="webkit.webprefs.tabs_to_links" type="checkbox"><span 104 pref="webkit.webprefs.tabs_to_links" type="checkbox"><span
103 i18n-content="tabsToLinksPref"></span></label></td> 105 i18n-content="tabsToLinksPref"></span></label></td>
104 </tr> 106 </tr>
105 </if> 107 </if>
106 <tr id="fontSettingsConfigureFontsOnlyButton"><td> 108 <tr id="fontSettingsConfigureFontsOnlyButton"><td>
107 <button id="fontSettingsConfigureFontsOnlyButton" 109 <button id="fontSettingsConfigureFontsOnlyButton"
108 i18n-content="fontSettingsConfigureFontsOnlyButton"></button> 110 i18n-content="fontSettingsConfigureFontsOnlyButton"></button>
109 </td></tr> 111 </td></tr>
110 </table> 112 </table>
111 </section> 113 </section>
114 <if expr="not pp_ifdef('chromeos')">
112 <section> 115 <section>
113 <h3 i18n-content="advancedSectionTitleSecurity"></h3> 116 <h3 i18n-content="advancedSectionTitleSecurity"></h3>
114 <table class="option-control-table"> 117 <table class="option-control-table">
115 <tr><td> 118 <tr><td>
116 <div class="section_text" 119 <div class="section_text"
117 i18n-content="certificatesLabel"></div> 120 i18n-content="certificatesLabel"></div>
118 <button id="certificatesManageButton" 121 <button id="certificatesManageButton"
119 i18n-content="certificatesManageButton"></button> 122 i18n-content="certificatesManageButton"></button>
120 </td></tr> 123 </td></tr>
121 <if expr="os == 'win32'"> 124 </if>
122 <!-- Configure these options for manual handling on windows --> 125 <if expr="os == 'win32'">
123 <tr id="sslCheckRevocationCheckbox"> 126 <!-- Configure these options for manual handling on windows -->
124 <td class="option-name"><label><input id="sslCheckRevocation" 127 <tr id="sslCheckRevocationCheckbox">
125 type="checkbox"><span i18n-content="sslCheckRevocation"></span> 128 <td class="option-name"><label><input id="sslCheckRevocation"
126 </label></td> 129 type="checkbox"><span i18n-content="sslCheckRevocation"></span>
127 </tr> 130 </label></td>
128 <tr id="sslUseSSL2Checkbox"> 131 </tr>
129 <td class="option-name"><label><input id="sslUseSSL2" 132 <tr id="sslUseSSL2Checkbox">
130 type="checkbox"><span i18n-content="sslUseSSL2"></span> 133 <td class="option-name"><label><input id="sslUseSSL2"
131 </label></td> 134 type="checkbox"><span i18n-content="sslUseSSL2"></span>
132 </tr> 135 </label></td>
133 </if> 136 </tr>
134 <if expr="os == 'linux2' or os.find('bsd') != -1"> 137 </if>
135 <!-- Configure these options for Linux/BSD as preference keys --> 138 <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)" >
136 <tr id="sslCheckRevocationCheckbox"> 139 <!-- Configure these options for Linux/BSD as preference keys -->
137 <td class="option-name"><label><input id="sslCheckRevocation" 140 <tr id="sslCheckRevocationCheckbox">
138 pref="ssl.rev_checking.enabled" type="checkbox"><span 141 <td class="option-name"><label><input id="sslCheckRevocation"
139 i18n-content="sslCheckRevocation"></span></label></td> 142 pref="ssl.rev_checking.enabled" type="checkbox"><span
140 </tr> 143 i18n-content="sslCheckRevocation"></span></label></td>
141 <tr id="sslUseSSL2Checkbox"> 144 </tr>
142 <td class="option-name"><label><input id="sslUseSSL2" 145 <tr id="sslUseSSL2Checkbox">
143 pref="ssl.ssl2.enabled" type="checkbox"><span 146 <td class="option-name"><label><input id="sslUseSSL2"
144 i18n-content="sslUseSSL2"></span></label></td> 147 pref="ssl.ssl2.enabled" type="checkbox"><spa
145 </tr> 148 i18n-content="sslUseSSL2"></span></label></td>
146 <tr id="sslUseSSL3Checkbox"> 149 </tr>
147 <td class="option-name"><label><input id="sslUseSSL3" 150 <tr id="sslUseSSL3Checkbox">
148 pref="ssl.ssl3.enabled" type="checkbox"><span 151 <td class="option-name"><label><input id="sslUseSSL3"
149 i18n-content="sslUseSSL3"></span></label></td> 152 pref="ssl.ssl3.enabled" type="checkbox"><span
150 </tr> 153 i18n-content="sslUseSSL3"></span></label></td>
151 <tr id="sslUseTLS1Checkbox"> 154 </tr>
152 <td class="option-name"><label><input id="sslUseTLS1" 155 <tr id="sslUseTLS1Checkbox">
153 pref="ssl.tls1.enabled" type="checkbox"><span 156 <td class="option-name"><label><input id="sslUseTLS1"
154 i18n-content="sslUseTLS1"></span></label></td> 157 pref="ssl.tls1.enabled" type="checkbox"><span
155 </tr> 158 i18n-content="sslUseTLS1"></span></label></td>
156 </if> 159 </tr>
160 </if>
161 <if expr="not pp_ifdef('chromeos')">
157 </table> 162 </table>
158 </section> 163 </section>
164 </if>
159 </div> 165 </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