MD Settings: Internet: Proxy: Support partial proxies

chrome/browser/resources/settings/internet_page/network_proxy.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Polymer element for displaying and editing network proxy
  * values.
  */
 Polymer({
   is: 'network-proxy',
@@ skipping 156 matching lines @@
           CrOnc.getActiveValue(proxySettings.Type));
       if (proxySettings.Manual) {
         proxy.Manual.HTTPProxy = /** @type {!CrOnc.ProxyLocation|undefined} */ (
                                      CrOnc.getSimpleActiveProperties(
                                          proxySettings.Manual.HTTPProxy)) ||
             {Host: '', Port: 80};
         proxy.Manual.SecureHTTPProxy =
             /** @type {!CrOnc.ProxyLocation|undefined} */ (
                 CrOnc.getSimpleActiveProperties(
                     proxySettings.Manual.SecureHTTPProxy)) ||
-            proxy.Manual.HTTPProxy;
+            {Host: '', Port: 80};
         proxy.Manual.FTPProxy =
             /** @type {!CrOnc.ProxyLocation|undefined} */ (
                 CrOnc.getSimpleActiveProperties(
                     proxySettings.Manual.FTPProxy)) ||
-            proxy.Manual.HTTPProxy;
+            {Host: '', Port: 80};
         proxy.Manual.SOCKS =
             /** @type {!CrOnc.ProxyLocation|undefined} */ (
                 CrOnc.getSimpleActiveProperties(proxySettings.Manual.SOCKS)) ||
-            proxy.Manual.HTTPProxy;
+            {Host: '', Port: 80};
         var jsonHttp = proxy.Manual.HTTPProxy;
         this.useSameProxy_ =
-            CrOnc.proxyMatches(jsonHttp, proxy.Manual.SecureHTTPProxy) &&
-            CrOnc.proxyMatches(jsonHttp, proxy.Manual.FTPProxy) &&
-            CrOnc.proxyMatches(jsonHttp, proxy.Manual.SOCKS);
+            (CrOnc.proxyMatches(jsonHttp, proxy.Manual.SecureHTTPProxy) &&
+             CrOnc.proxyMatches(jsonHttp, proxy.Manual.FTPProxy) &&
+             CrOnc.proxyMatches(jsonHttp, proxy.Manual.SOCKS)) ||
+            (!proxy.Manual.SecureHTTPProxy.Host &&
+             !proxy.Manual.FTPProxy.Host && !proxy.Manual.SOCKS.Host);
       }
       if (proxySettings.ExcludeDomains) {
         proxy.ExcludeDomains = /** @type {!Array<string>|undefined} */ (
             CrOnc.getActiveValue(proxySettings.ExcludeDomains));
       }
       proxy.PAC = /** @type {string|undefined} */ (
           CrOnc.getActiveValue(proxySettings.PAC));
     }
     // Use saved ExcludeDomanains and Manual if not defined.
     proxy.ExcludeDomains = proxy.ExcludeDomains || this.savedExcludeDomains_;
@@ skipping 47 matching lines @@
       },
       PAC: ''
     };
   },
 
   /**
    * Called when the proxy changes in the UI.
    * @private
    */
   sendProxyChange_: function() {
-    if (this.proxy_.Type == CrOnc.ProxySettingsType.MANUAL) {
-      var proxy =
-          /** @type {!CrOnc.ProxySettings} */ (Object.assign({}, this.proxy_));
+    var proxy =
+        /** @type {!CrOnc.ProxySettings} */ (Object.assign({}, this.proxy_));
+    if (proxy.Type == CrOnc.ProxySettingsType.MANUAL) {
       var manual = proxy.Manual;
-      var defaultProxy = manual.HTTPProxy;
-      if (!defaultProxy || !defaultProxy.Host)
-        return;
-      if (this.useSameProxy_ || !this.get('SecureHTTPProxy.Host', manual)) {
+      var defaultProxy = manual.HTTPProxy || {Host: '', Port: 80};
+      if (this.useSameProxy_) {
         proxy.Manual.SecureHTTPProxy = /** @type {!CrOnc.ProxyLocation} */ (
             Object.assign({}, defaultProxy));
-      }
-      if (this.useSameProxy_ || !this.get('FTPProxy.Host', manual)) {
         proxy.Manual.FTPProxy = /** @type {!CrOnc.ProxyLocation} */ (
             Object.assign({}, defaultProxy));
-      }
-      if (this.useSameProxy_ || !this.get('SOCKS.Host', manual)) {
         proxy.Manual.SOCKS = /** @type {!CrOnc.ProxyLocation} */ (
             Object.assign({}, defaultProxy));
+      } else {
+        // Remove properties with empty hosts to unset them.
+        if (manual.HTTPProxy && !manual.HTTPProxy.Host)
+          delete manual.HTTPProxy;
+        if (manual.SecureHTTPProxy && !manual.SecureHTTPProxy.Host)
+          delete manual.SecureHTTPProxy;
+        if (manual.FTPProxy && !manual.FTPProxy.Host)
+          delete manual.FTPProxy;
+        if (manual.SOCKS && !manual.SOCKS.Host)
+          delete manual.SOCKS;
       }
-      this.savedManual_ = Object.assign({}, proxy.Manual);
+      this.savedManual_ = Object.assign({}, manual);
       this.savedExcludeDomains_ = proxy.ExcludeDomains;
-      this.proxy_ = proxy;
-    } else if (this.proxy_.Type == CrOnc.ProxySettingsType.PAC) {
-      if (!this.proxy_.PAC)
+    } else if (proxy.Type == CrOnc.ProxySettingsType.PAC) {
+      if (!proxy.PAC)
         return;
     }
-    this.fire('proxy-change', {field: 'ProxySettings', value: this.proxy_});
+    this.fire('proxy-change', {field: 'ProxySettings', value: proxy});
     this.proxyModified_ = false;
   },
 
   /**
    * Event triggered when the selected proxy type changes.
    * @param {!Event} event
    * @private
    */
   onTypeChange_: function(event) {
     var target = /** @type {!HTMLSelectElement} */ (event.target);
@@ skipping 133 matching lines @@
         this.networkProperties.Source == 'DevicePolicy';
   },
 
   /**
    * @return {boolean}
    * @private
    */
   isSaveManualProxyEnabled_: function() {
     if (!this.proxyModified_)
       return false;
-    return !!this.get('HTTPProxy.Host', this.proxy_.Manual);
+    var manual = this.proxy_.Manual;
+    var httpHost = this.get('HTTPProxy.Host', manual);
+    if (this.useSameProxy_)
+      return !!httpHost;
+    return !!httpHost || !!this.get('SecureHTTPProxy.Host', manual) ||
+        !!this.get('FTPProxy.Host', manual) || !!this.get('SOCKS.Host', manual);
   },
 
   /**
    * @param {string} property The property to test
    * @param {string} value The value to test against
    * @return {boolean} True if property == value
    * @private
    */
   matches_: function(property, value) {
     return property == value;
@@ skipping 23 matching lines @@
    * Handles the shared proxy confirmation dialog 'Cancel' button or a cancel
    * event.
    * @private
    */
   onAllowSharedDialogCancel_: function() {
     /** @type {!SettingsCheckboxElement} */ (this.$.allowShared)
         .resetToPrefValue();
     this.$.confirmAllowSharedDialog.close();
   },
 });