chrome/browser/resources/options/chromeos/proxy.html - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

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

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 1 month 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

« chrome/browser/chromeos/proxy_config_service_impl.cc ('K') | « chrome/browser/resources/options/chromeos/internet_options.js ('k') | chrome/browser/resources/options/chromeos/proxy_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <div id="proxyPage" class="page" hidden>	1 <div id="proxyPage" class="page" hidden>

	2 <div id="info-banner" class="managed-prefs-banner" hidden>

	3 <span id="banner-icon" class="managed-prefs-icon"></span>

	4 <span id="banner-text" class="managed-prefs-text"></span>

	5 </div>

2 <h1 id="proxy-page-title" i18n-content="proxyPage"></h1>	6 <h1 id="proxy-page-title" i18n-content="proxyPage"></h1>

3 <section>	7 <section>

4 <h3 i18n-content="proxy_config_title"></h3>	8 <h3 i18n-content="proxy_config_title"></h3>

5 <div>	9 <div>

6 <div class="radio">	10 <div class="radio">

7 <label>	11 <label>

8 <input id="directProxy" type="radio" name="proxytype" value="1"	12 <input id="directProxy" type="radio" name="proxytype" value="1"

9 pref="cros.session.proxy.type">	13 pref="cros.session.proxy.type">

10 <span i18n-content="proxyDirectInternetConnection"></span>	14 <span i18n-content="proxyDirectInternetConnection"></span>

11 </label>	15 </label>

(...skipping 15 matching lines...) Expand all Loading...
27 <div id="singleProxy">	31 <div id="singleProxy">

28 <table>	32 <table>

29 <tr>	33 <tr>

30 <td>	34 <td>

31 <span i18n-content="httpProxy"></span>	35 <span i18n-content="httpProxy"></span>

32 <input id="proxyHostSingleName" type="text" size="30"	36 <input id="proxyHostSingleName" type="text" size="30"

33 pref="cros.session.proxy.singlehttp" disabled>	37 pref="cros.session.proxy.singlehttp" disabled>

34 </td>	38 </td>

35 <td>	39 <td>

36 <span i18n-content="proxyPort"></span>	40 <span i18n-content="proxyPort"></span>

37 <input id="proxyHostSinglePort" type="text" dataType="number" size ="5"	41 <input id="proxyHostSinglePort" type="text" dataType="number"

38 pref="cros.session.proxy.singlehttpport" disabled>	42 size="5" pref="cros.session.proxy.singlehttpport" disabled>

39 </td>	43 </td>

40 </tr>	44 </tr>

41 </table>	45 </table>

42 </div>	46 </div>

43 <div id="multiProxy">	47 <div id="multiProxy">

44 <table>	48 <table>

45 <tr>	49 <tr>

46 <td>	50 <td>

47 <span i18n-content="httpProxy"></span>	51 <span i18n-content="httpProxy"></span>

48 </td>	52 </td>

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 <span i18n-content="proxyConfigUrl"></span>	124 <span i18n-content="proxyConfigUrl"></span>

121 <input id="proxyConfig" type="url" size="60"	125 <input id="proxyConfig" type="url" size="60"

122 pref="cros.session.proxy.pacurl">	126 pref="cros.session.proxy.pacurl">

123 </label>	127 </label>

124 </div>	128 </div>

125 </div>	129 </div>

126 </section>	130 </section>

127 <section id="advancedConfig">	131 <section id="advancedConfig">

128 <h3 i18n-content="advanced_proxy_config"></h3>	132 <h3 i18n-content="advanced_proxy_config"></h3>

129 <div class="option">	133 <div class="option">

130 <div i18n-content="proxyBypass"></div>	134 <div i18n-content="proxyBypass"></div>

131 <list id="ignoredHostList"></list>	135 <list id="ignoredHostList"></list>

132 <input id="newHost" type="url" size="30">	136 <input id="newHost" type="url" size="30">

133 <button id="addHost" i18n-content="addHost"></button>	137 <button id="addHost" i18n-content="addHost"></button>

134 <button id="removeHost" i18n-content="removeHost"></button>	138 <button id="removeHost" i18n-content="removeHost"></button>

135 </div>	139 </div>

136 </section>	140 </section>

137 </div>	141 </div>

OLD	NEW