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

Unified Diff: chrome/browser/resources/options2/chromeos/proxy.html

Issue 8937011: Revert "Options2: Pull the trigger." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options2/chromeos/proxy.html
diff --git a/chrome/browser/resources/options2/chromeos/proxy.html b/chrome/browser/resources/options2/chromeos/proxy.html
deleted file mode 100644
index 0449c7bdeb89cb39be68af2b5c3662ff1f2a7a65..0000000000000000000000000000000000000000
--- a/chrome/browser/resources/options2/chromeos/proxy.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<div id="proxyPage" class="page" hidden>
- <div id="info-banner" class="managed-prefs-banner" hidden>
- <span id="banner-icon" class="managed-prefs-icon"></span>
- <span id="banner-text" class="managed-prefs-text"></span>
- </div>
- <h1 id="proxy-page-title" i18n-content="proxyPage"></h1>
- <section>
- <h3 i18n-content="proxy_config_title"></h3>
- <div>
- <div class="radio">
- <label>
- <input id="directProxy" type="radio" name="proxytype" value="1"
- pref="cros.session.proxy.type">
- <span i18n-content="proxyDirectInternetConnection"></span>
- </label>
- </div>
- <div class="radio">
- <label>
- <input id="manualProxy" type="radio" name="proxytype" value="2"
- pref="cros.session.proxy.type">
- <span i18n-content="proxyManual"></span>
- </label>
- </div>
- <div class="checkbox">
- <label>
- <input id="proxyAllProtocols" type="checkbox"
- pref="cros.session.proxy.single">
- <span i18n-content="sameProxyProtocols"></span>
- </label>
- </div>
- <div id="singleProxy">
- <table>
- <tr>
- <td>
- <span i18n-content="httpProxy"></span>
- <input id="proxyHostSingleName" type="text" size="30"
- pref="cros.session.proxy.singlehttp" disabled>
- </td>
- <td>
- <span i18n-content="proxyPort"></span>
- <input id="proxyHostSinglePort" type="text" data-type="number"
- size="5" pref="cros.session.proxy.singlehttpport" disabled>
- </td>
- </tr>
- </table>
- </div>
- <div id="multiProxy">
- <table>
- <tr>
- <td>
- <span i18n-content="httpProxy"></span>
- </td>
- <td>
- <input id="proxyHostName" type="text" size="30"
- pref="cros.session.proxy.httpurl" disabled>
- </td>
- <td>
- <span i18n-content="proxyPort"></span>
- </td>
- <td>
- <input id="proxyHostPort" type="text" data-type="number" size="5"
- pref="cros.session.proxy.httpport" disabled>
- </td>
- </tr>
- <tr>
- <td>
- <span i18n-content="secureHttpProxy"></span>
- </td>
- <td>
- <input id="secureProxyHostName" type="text" size="30"
- pref="cros.session.proxy.httpsurl" disabled>
- </td>
- <td>
- <span i18n-content="proxyPort"></span>
- </td>
- <td>
- <input id="secureProxyPort" type="text" data-type="number" size="5"
- pref="cros.session.proxy.httpsport" disabled>
- </td>
- </tr>
- <tr>
- <td>
- <span i18n-content="ftpProxy"></span>
- </td>
- <td>
- <input id="ftpProxy" type="text" size="30"
- pref="cros.session.proxy.ftpurl" disabled>
- </td>
- <td>
- <span i18n-content="proxyPort"></span>
- </td>
- <td>
- <input id="ftpProxyPort" type="text" data-type="number" size="5"
- pref="cros.session.proxy.ftpport" disabled>
- </td>
- </tr>
- <tr>
- <td>
- <span i18n-content="socksHost"></span>
- </td>
- <td>
- <input id="socksHost" type="text" size="30"
- pref="cros.session.proxy.socks" disabled>
- </td>
- <td>
- <span i18n-content="proxyPort"></span>
- </td>
- <td>
- <input id="socksPort" type="text" data-type="number" size="5"
- pref="cros.session.proxy.socksport" disabled>
- </td>
- </tr>
- </table>
- </div>
- <div class="radio">
- <label>
- <input id="autoProxy" type="radio" name="proxytype" value="3"
- pref="cros.session.proxy.type">
- <span i18n-content="proxyAutomatic"></span>
- </label>
- </div>
- <div>
- <label>
- <span i18n-content="proxyConfigUrl"></span>
- <input id="proxyConfig" type="url" size="60"
- pref="cros.session.proxy.pacurl">
- </label>
- </div>
- </div>
- </section>
- <section id="advancedConfig">
- <h3 i18n-content="advanced_proxy_config"></h3>
- <div class="option">
- <div i18n-content="proxyBypass"></div>
- <list id="ignoredHostList"></list>
- <input id="newHost" type="url" size="30">
- <button id="addHost" i18n-content="addHost"></button>
- <button id="removeHost" i18n-content="removeHost"></button>
- </div>
- </section>
-</div>
« no previous file with comments | « chrome/browser/resources/options2/chromeos/proxy.css ('k') | chrome/browser/resources/options2/chromeos/proxy_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698