Backed out changeset 922881dd399a (bug 1581670) for causing breowser-chrome failures on browser_extension_controlled.js CLOSED TREE
authorarthur.iakab <aiakab@mozilla.com>
Fri, 04 Oct 2019 00:44:55 +0300
changeset 496241 d11c8544621f0b7a1d9cf43893882a22e8897469
parent 496240 5b8b04d1fd7da27ed1665ad1bf0651a14562d047
child 496242 b386ee32d8f6ae0dda09898d2b40247b96cfae17
push id36647
push usernerli@mozilla.com
push dateFri, 04 Oct 2019 04:09:18 +0000
treeherdermozilla-central@678d4d2c3c4d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1581670
milestone71.0a1
backs out922881dd399a94bda9635be2745af79fa8878238
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 922881dd399a (bug 1581670) for causing breowser-chrome failures on browser_extension_controlled.js CLOSED TREE
browser/components/preferences/connection.xul
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -46,68 +46,86 @@
   <groupbox>
     <label><html:h2 data-l10n-id="connection-proxy-configure"/></label>
 
     <radiogroup id="networkProxyType" preference="network.proxy.type">
       <radio value="0" data-l10n-id="connection-proxy-option-no" />
       <radio value="4" data-l10n-id="connection-proxy-option-auto" />
       <radio value="5" data-l10n-id="connection-proxy-option-system" id="systemPref" hidden="true" />
       <radio value="1" data-l10n-id="connection-proxy-option-manual"/>
-      <box class="indent" flex="1" style="display: grid; grid-template-columns: auto 1fr; align-items: center;">
-        <hbox pack="end">
-          <label data-l10n-id="connection-proxy-http" control="networkProxyHTTP" />
-        </hbox>
-        <hbox align="center">
-          <html:input id="networkProxyHTTP" type="text" style="-moz-box-flex: 1;"
-                      preference="network.proxy.http"/>
-          <label data-l10n-id="connection-proxy-http-port" control="networkProxyHTTP_Port" />
-          <html:input id="networkProxyHTTP_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535"
-                      preference="network.proxy.http_port"/>
-        </hbox>
-        <hbox/>
-        <hbox>
-          <checkbox id="shareAllProxies" data-l10n-id="connection-proxy-http-share"
-                    preference="network.proxy.share_proxy_settings"/>
-        </hbox>
-        <hbox pack="end">
-          <label data-l10n-id="connection-proxy-ssl" control="networkProxySSL"/>
-        </hbox>
-        <hbox align="center">
-          <html:input id="networkProxySSL" type="text" style="-moz-box-flex: 1;" preference="network.proxy.ssl"/>
-          <label data-l10n-id="connection-proxy-ssl-port" control="networkProxySSL_Port" />
-          <html:input id="networkProxySSL_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"
-                      preference="network.proxy.ssl_port"/>
-        </hbox>
-        <hbox pack="end">
-          <label data-l10n-id="connection-proxy-ftp" control="networkProxyFTP"/>
-        </hbox>
-        <hbox align="center">
-          <html:input id="networkProxyFTP" type="text" style="-moz-box-flex: 1;" preference="network.proxy.ftp"/>
-          <label data-l10n-id="connection-proxy-ftp-port" control="networkProxyFTP_Port"/>
-          <html:input id="networkProxyFTP_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"
-                      preference="network.proxy.ftp_port"/>
-        </hbox>
-        <hbox pack="end">
-          <label data-l10n-id="connection-proxy-socks" control="networkProxySOCKS"/>
-        </hbox>
-        <hbox align="center">
-          <html:input id="networkProxySOCKS" type="text" style="-moz-box-flex: 1;" preference="network.proxy.socks"/>
-          <label data-l10n-id="connection-proxy-socks-port" control="networkProxySOCKS_Port"/>
-          <html:input id="networkProxySOCKS_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"
-                      preference="network.proxy.socks_port"/>
-        </hbox>
-        <spacer/>
-        <box pack="start">
-        <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
-                    preference="network.proxy.socks_version">
-          <radio id="networkProxySOCKSVersion4" value="4" data-l10n-id="connection-proxy-socks4" />
-          <radio id="networkProxySOCKSVersion5" value="5" data-l10n-id="connection-proxy-socks5" />
-        </radiogroup>
-        </box>
-      </box>
+      <grid class="indent" flex="1">
+        <columns>
+          <column/>
+          <column flex="1"/>
+        </columns>
+        <rows>
+          <row align="center">
+            <hbox pack="end">
+              <label data-l10n-id="connection-proxy-http" control="networkProxyHTTP" />
+            </hbox>
+            <hbox align="center">
+              <html:input id="networkProxyHTTP" type="text" style="-moz-box-flex: 1;"
+                          preference="network.proxy.http"/>
+              <label data-l10n-id="connection-proxy-http-port" control="networkProxyHTTP_Port" />
+              <html:input id="networkProxyHTTP_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535"
+                          preference="network.proxy.http_port"/>
+            </hbox>
+          </row>
+          <row>
+            <hbox/>
+            <hbox>
+              <checkbox id="shareAllProxies" data-l10n-id="connection-proxy-http-share"
+                        preference="network.proxy.share_proxy_settings"/>
+            </hbox>
+          </row>
+          <row align="center">
+            <hbox pack="end">
+              <label data-l10n-id="connection-proxy-ssl" control="networkProxySSL"/>
+            </hbox>
+            <hbox align="center">
+              <html:input id="networkProxySSL" type="text" style="-moz-box-flex: 1;" preference="network.proxy.ssl"/>
+              <label data-l10n-id="connection-proxy-ssl-port" control="networkProxySSL_Port" />
+              <html:input id="networkProxySSL_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"
+                          preference="network.proxy.ssl_port"/>
+            </hbox>
+          </row>
+          <row align="center">
+            <hbox pack="end">
+              <label data-l10n-id="connection-proxy-ftp" control="networkProxyFTP"/>
+            </hbox>
+            <hbox align="center">
+              <html:input id="networkProxyFTP" type="text" style="-moz-box-flex: 1;" preference="network.proxy.ftp"/>
+              <label data-l10n-id="connection-proxy-ftp-port" control="networkProxyFTP_Port"/>
+              <html:input id="networkProxyFTP_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"
+                          preference="network.proxy.ftp_port"/>
+            </hbox>
+          </row>
+          <row align="center">
+            <hbox pack="end">
+              <label data-l10n-id="connection-proxy-socks" control="networkProxySOCKS"/>
+            </hbox>
+            <hbox align="center">
+              <html:input id="networkProxySOCKS" type="text" style="-moz-box-flex: 1;" preference="network.proxy.socks"/>
+              <label data-l10n-id="connection-proxy-socks-port" control="networkProxySOCKS_Port"/>
+              <html:input id="networkProxySOCKS_Port" class="proxy-port-input" hidespinbuttons="true" type="number" min="0" max="65535" size="5"
+                          preference="network.proxy.socks_port"/>
+            </hbox>
+          </row>
+          <row>
+            <spacer/>
+            <box pack="start">
+            <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
+                        preference="network.proxy.socks_version">
+              <radio id="networkProxySOCKSVersion4" value="4" data-l10n-id="connection-proxy-socks4" />
+              <radio id="networkProxySOCKSVersion5" value="5" data-l10n-id="connection-proxy-socks5" />
+            </radiogroup>
+            </box>
+          </row>
+        </rows>
+      </grid>
       <radio value="2" data-l10n-id="connection-proxy-autotype" />
       <hbox class="indent" flex="1" align="center">
         <html:input id="networkProxyAutoconfigURL" type="text" style="-moz-box-flex: 1;" preference="network.proxy.autoconfig_url"
                     oninput="gConnectionsDialog.updateReloadButton();"/>
         <button id="autoReload" icon="refresh"
                 data-l10n-id="connection-proxy-reload"
                 oncommand="gConnectionsDialog.reloadPAC();"
                 preference="pref.advanced.proxies.disable_button.reload"/>