Move proxy handling into network details.

chrome/browser/resources/options2/chromeos/internet_detail.html

Index: chrome/browser/resources/options2/chromeos/internet_detail.html
diff --git a/chrome/browser/resources/options2/chromeos/internet_detail.html b/chrome/browser/resources/options2/chromeos/internet_detail.html
index 742d3793b35193eb9cc05724ea609c04ff1a76b1..fd4c4f1d8e3d17785cc581ee535e2adf2c530ad2 100644
--- a/chrome/browser/resources/options2/chromeos/internet_detail.html
+++ b/chrome/browser/resources/options2/chromeos/internet_detail.html
@@ -56,6 +56,11 @@
         <span class="tab-label" i18n-content="securityTabLabel"></span>
         <span class="active-tab-label" i18n-content="securityTabLabel"></span>
       </span>
+      <span id="internet-proxy-nav-tab" class="tab proxy-details"
+          tab-contents="network-proxy-tab">
+        <span class="tab-label" i18n-content="proxyTabLabel"></span>
+        <span class="active-tab-label" i18n-content="proxyTabLabel"></span>
+      </span>
     </div>
     <div id="wifiNetworkTab" class="subpages-tab-contents wifi-details">
       <section>
@@ -344,12 +349,6 @@
           </div>
         </div>
       </section>
-      <section id="change-proxy-section">
-        <div>
-          <button id="change-proxy-button" i18n-content="changeProxyButton">
-          </button>
-        </div>
-      </section>
     </div>
     <div id="security-tab"
          class="subpages-tab-contents cellular-details gsm-only">
@@ -373,10 +372,149 @@
         </section>
       </div>
     </div>
+    <div id="network-proxy-tab" class="subpages-tab-contents">
+      <section>
+        <div id="info-banner" hidden>
+          <span id="banner-icon" class="managed-prefs-icon"></span>
+          <span id="banner-text" class="managed-prefs-text"></span>
+        </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="25"
+                    pref="cros.session.proxy.singlehttp" disabled>
+              </td>
+              <td>
+                <span i18n-content="proxyPort"></span>
+                <input id="proxyHostSinglePort" type="text" data-type="number"
+                    size="4" 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="25"
+                    pref="cros.session.proxy.httpurl" disabled>
+              </td>
+              <td>
+                <span i18n-content="proxyPort"></span>
+              </td>
+              <td>
+                <input id="proxyHostPort" type="text" data-type="number"
+                     size="4" pref="cros.session.proxy.httpport" disabled>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <span i18n-content="secureHttpProxy"></span>
+              </td>
+              <td>
+                <input id="secureProxyHostName" type="text" size="25"
+                    pref="cros.session.proxy.httpsurl" disabled>
+              </td>
+              <td>
+                <span i18n-content="proxyPort"></span>
+              </td>
+              <td>
+                <input id="secureProxyPort" type="text" data-type="number"
+                     size="4" pref="cros.session.proxy.httpsport" disabled>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <span i18n-content="ftpProxy"></span>
+              </td>
+              <td>
+                <input id="ftpProxy" type="text" size="25"
+                    pref="cros.session.proxy.ftpurl" disabled>
+              </td>
+              <td>
+                <span i18n-content="proxyPort"></span>
+                </td>
+              <td>
+                <input id="ftpProxyPort" type="text" data-type="number" size="4"
+                    pref="cros.session.proxy.ftpport" disabled>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <span i18n-content="socksHost"></span>
+              </td>
+              <td>
+                <input id="socksHost" type="text" size="25"
+                    pref="cros.session.proxy.socks" disabled>
+              </td>
+              <td>
+                <span i18n-content="proxyPort"></span>
+              </td>
+              <td>
+                <input id="socksPort" type="text" data-type="number" size="4"
+                    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>
+            <div i18n-content="proxyConfigUrl"></div>
+            <input id="proxyConfig" type="url" size="50"
+                pref="cros.session.proxy.pacurl">
+          </label>
+        </div>
+        <div id="advancedConfig">
+          <h3 i18n-content="advanced_proxy_config"></h3>
+          <div class="option vbox flex">
+            <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>
+        </div>
+      </section>
+    </div>
   </div>
   <div class="action-area">
     <div class="button-strip">
       <!-- TODO(dbeam): Clarify style guide regarding tag wrap. -->
+      <!-- TODO(kevers): Style cleanup.  IDs should be hyphen-delimited
+           lowercase. -->
       <button id="detailsInternetDismiss" i18n-content="detailsInternetDismiss">
       </button>
       <button id="detailsInternetLogin" i18n-content="connect_button"></button>