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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/chromeos/proxy.html

Issue 6737035: Proxy settings automation hooks and related proxy settings fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix outdated header. Created 9 years, 8 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/chromeos/proxy_cros_settings_provider.cc ('k') | chrome/browser/resources/options/pref_ui.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="proxyPage"> 1 <div class="page hidden" id="proxyPage">
2 <h1 i18n-content="proxyPage"></h1> 2 <h1 i18n-content="proxyPage"></h1>
3 <section> 3 <section>
4 <h3 i18n-content="proxy_config_title"></h3> 4 <h3 i18n-content="proxy_config_title"></h3>
5 <div> 5 <div>
6 <div class="radio"> 6 <div class="radio">
7 <label> 7 <label>
8 <input type="radio" id="directProxy" name="proxytype" 8 <input type="radio" id="directProxy" name="proxytype"
9 pref="cros.session.proxy.type" value="1"> 9 pref="cros.session.proxy.type" value="1">
10 <span i18n-content="proxyDirectInternetConnection"></span> 10 <span i18n-content="proxyDirectInternetConnection"></span>
(...skipping 14 matching lines...) Expand all
25 </label> 25 </label>
26 </div> 26 </div>
27 <div id="singleProxy"> 27 <div id="singleProxy">
28 <table> 28 <table>
29 <tr><td><span 29 <tr><td><span
30 i18n-content="httpProxy"></span> 30 i18n-content="httpProxy"></span>
31 <input id="proxyHostSingleName" type="text" size="30" pref="cros.sessi on.proxy.singlehttp" disabled> 31 <input id="proxyHostSingleName" type="text" size="30" pref="cros.sessi on.proxy.singlehttp" disabled>
32 </td><td> 32 </td><td>
33 <span 33 <span
34 i18n-content="proxyPort"></span> 34 i18n-content="proxyPort"></span>
35 <input id="proxyHostSinglePort" type="text" size="5" pref="cros.sessio n.proxy.singlehttpport" disabled> 35 <input id="proxyHostSinglePort" type="text" dataType="number" size="5" pref="cros.session.proxy.singlehttpport" disabled>
36 </td></tr> 36 </td></tr>
37 </table> 37 </table>
38 </div> 38 </div>
39 <div id="multiProxy"> 39 <div id="multiProxy">
40 <table> 40 <table>
41 <tr> 41 <tr>
42 <td><span 42 <td><span
43 i18n-content="httpProxy"></span></td><td> 43 i18n-content="httpProxy"></span></td><td>
44 <input id="proxyHostName" type="text" size="30" pref="cros.session.pro xy.httpurl" disabled> 44 <input id="proxyHostName" type="text" size="30" pref="cros.session.pro xy.httpurl" disabled>
45 </td><td> 45 </td><td>
46 <span 46 <span
47 i18n-content="proxyPort"></span></td><td> 47 i18n-content="proxyPort"></span></td><td>
48 <input id="proxyHostPort" type="text" size="5" pref="cros.session.proxy. httpport" disabled> 48 <input id="proxyHostPort" type="text" dataType="number" size="5" pref="c ros.session.proxy.httpport" disabled>
49 </td></tr> 49 </td></tr>
50 <tr> 50 <tr>
51 <td><span 51 <td><span
52 i18n-content="secureHttpProxy"></span></td><td> 52 i18n-content="secureHttpProxy"></span></td><td>
53 <input id="secureProxyHostName" type="text" size="30" pref="cros.session .proxy.httpsurl" disabled> 53 <input id="secureProxyHostName" type="text" size="30" pref="cros.session .proxy.httpsurl" disabled>
54 </td><td> 54 </td><td>
55 <span 55 <span
56 i18n-content="proxyPort"></span></td><td> 56 i18n-content="proxyPort"></span></td><td>
57 <input id="secureProxyPort" type="text" size="5" pref="cros.session.prox y.httpsport" disabled> 57 <input id="secureProxyPort" type="text" dataType="number" size="5" pref= "cros.session.proxy.httpsport" disabled>
58 </td></tr> 58 </td></tr>
59 <tr> 59 <tr>
60 <td><span 60 <td><span
61 i18n-content="ftpProxy"></span></td><td> 61 i18n-content="ftpProxy"></span></td><td>
62 <input id="ftpProxy" type="text" size="30" pref="cros.session.proxy.ft purl" disabled> 62 <input id="ftpProxy" type="text" size="30" pref="cros.session.proxy.ft purl" disabled>
63 </td><td> 63 </td><td>
64 <span 64 <span
65 i18n-content="proxyPort"></span></td><td> 65 i18n-content="proxyPort"></span></td><td>
66 <input id="ftpProxyPort" type="text" size="5" pref="cros.session.proxy .ftpport" disabled> 66 <input id="ftpProxyPort" type="text" dataType="number" size="5" pref=" cros.session.proxy.ftpport" disabled>
67 </td></tr> 67 </td></tr>
68 <tr> 68 <tr>
69 <td><span 69 <td><span
70 i18n-content="socksHost"></span></td><td> 70 i18n-content="socksHost"></span></td><td>
71 <input id="socksHost" type="text" size="30" pref="cros.session.proxy.s ocks" disabled> 71 <input id="socksHost" type="text" size="30" pref="cros.session.proxy.s ocks" disabled>
72 </td><td> 72 </td><td>
73 <span 73 <span
74 i18n-content="proxyPort"></span></td><td> 74 i18n-content="proxyPort"></span></td><td>
75 <input id="socksPort" type="text" size="5" pref="cros.session.proxy.so cksport" disabled> 75 <input id="socksPort" type="text" dataType="number" size="5" pref="cro s.session.proxy.socksport" disabled>
76 </td></tr> 76 </td></tr>
77 </table> 77 </table>
78 </div> 78 </div>
79 <div class="radio"> 79 <div class="radio">
80 <label> 80 <label>
81 <input type="radio" id="autoProxy" name="proxytype" 81 <input type="radio" id="autoProxy" name="proxytype"
82 pref="cros.session.proxy.type" value="3"> 82 pref="cros.session.proxy.type" value="3">
83 <span i18n-content="proxyAutomatic"></span> 83 <span i18n-content="proxyAutomatic"></span>
84 <label> 84 <label>
85 </div> 85 </div>
(...skipping 12 matching lines...) Expand all
98 <div i18n-content="proxyBypass"></div> 98 <div i18n-content="proxyBypass"></div>
99 <list id="ignoredHostList"></list> 99 <list id="ignoredHostList"></list>
100 <input id="newHost" type="url" size="30"> 100 <input id="newHost" type="url" size="30">
101 <button id="addHost" 101 <button id="addHost"
102 i18n-content="addHost"></button> 102 i18n-content="addHost"></button>
103 <button id="removeHost" 103 <button id="removeHost"
104 i18n-content="removeHost"></button> 104 i18n-content="removeHost"></button>
105 </div> 105 </div>
106 </section> 106 </section>
107 </div> 107 </div>
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/proxy_cros_settings_provider.cc ('k') | chrome/browser/resources/options/pref_ui.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698