MD Settings: Internet: IP Settings: Only set to static on change

chrome/browser/resources/settings/internet_page/network_ip_config.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 the IP Config properties for
  * a network state. TODO(stevenjb): Allow editing of static IP configurations
  * when 'editable' is true.
  */
 Polymer({
@@ skipping 17 matching lines @@
       type: Boolean,
       value: false,
     },
 
     /**
      * State of 'Configure IP Addresses Automatically'.
      * @private
      */
     automatic_: {
       type: Boolean,
-      value: false,
+      value: true,
       observer: 'automaticChanged_',
     },
 
     /**
      * The currently visible IP Config property dictionary. The 'RoutingPrefix'
      * property is a human-readable mask instead of a prefix length.
      * @private {!{
      *   ipv4: !CrOnc.IPConfigUIProperties,
      *   ipv6: !CrOnc.IPConfigUIProperties
      * }|undefined}
@@ skipping 28 matching lines @@
    * Polymer networkProperties changed method.
    */
   networkPropertiesChanged_: function(newValue, oldValue) {
     if (!this.networkProperties)
       return;
 
     if (newValue.GUID != (oldValue && oldValue.GUID))
       this.savedStaticIp_ = undefined;
 
     // Update the 'automatic' property.
-    var ipConfigType =
-        CrOnc.getActiveValue(this.networkProperties.IPAddressConfigType);
-    this.automatic_ = (ipConfigType != CrOnc.IPConfigType.STATIC);
+    if (this.networkProperties.IPAddressConfigType ) {
+      var ipConfigType =
+          CrOnc.getActiveValue(this.networkProperties.IPAddressConfigType);
+      this.automatic_ = (ipConfigType != CrOnc.IPConfigType.STATIC);
+    }
 
-    // Update the 'ipConfig' property.
-    var ipv4 =
-        CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV4);
-    var ipv6 =
-        CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV6);
-    this.ipConfig_ = {
-      ipv4: this.getIPConfigUIProperties_(ipv4),
-      ipv6: this.getIPConfigUIProperties_(ipv6)
-    };
+    if (this.networkProperties.IPConfigs) {
+      // Update the 'ipConfig' property.
+      var ipv4 =
+          CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV4);
+      var ipv6 =
+          CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV6);
+      this.ipConfig_ = {
+        ipv4: this.getIPConfigUIProperties_(ipv4),
+        ipv6: this.getIPConfigUIProperties_(ipv6)
+      };
+    }
+  },
+
+  /** @private */
+  automaticChanged_: function() {
+    if (!this.automatic_ || !this.ipConfig_) {
+      // When switching from automatic, don't send any changes, ip-change will
+      // be fired in onIPChange when a field is changed.
+      return;
+    }
+    // Save the static IP configuration when switching to automatic.
+    this.savedStaticIp_ = this.ipConfig_.ipv4;
+    // Send the change.
+    this.fire('ip-change', {
+      field: 'IPAddressConfigType',
+      value: CrOnc.IPConfigType.DHCP,
+    });
   },
 
   /**
-   * Polymer automatic changed method.
-   */
-  automaticChanged_: function() {
-    if (!this.automatic_ || !this.ipConfig_)
-      return;
-    if (this.automatic_ || !this.savedStaticIp_) {
-      // Save the static IP configuration when switching to automatic.
-      this.savedStaticIp_ = this.ipConfig_.ipv4;
-      var configType =
-          this.automatic_ ? CrOnc.IPConfigType.DHCP : CrOnc.IPConfigType.STATIC;
-      this.fire('ip-change', {
-        field: 'IPAddressConfigType',
-        value: configType,
-      });
-    } else {
-      // Restore the saved static IP configuration.
-      var ipconfig = {
-        Gateway: this.savedStaticIp_.Gateway,
-        IPAddress: this.savedStaticIp_.IPAddress,
-        RoutingPrefix: this.savedStaticIp_.RoutingPrefix,
-        Type: this.savedStaticIp_.Type,
-      };
-      this.fire('ip-change', {
-        field: 'StaticIPConfig',
-        value: this.getIPConfigProperties_(ipconfig),
-      });
-    }
-  },
-
-  /**
    * @param {!CrOnc.IPConfigProperties|undefined} ipconfig
    * @return {!CrOnc.IPConfigUIProperties} A new IPConfigUIProperties object
    *     with RoutingPrefix expressed as a string mask instead of a prefix
    *     length. Returns an empty object if |ipconfig| is undefined.
    * @private
    */
   getIPConfigUIProperties_: function(ipconfig) {
     var result = {};
     if (!ipconfig)
       return result;
@@ skipping 53 matching lines @@
    *     network-property-list change event.
    * @private
    */
   onIPChange_: function(event) {
     if (!this.ipConfig_)
       return;
     var field = event.detail.field;
     var value = event.detail.value;
     // Note: |field| includes the 'ipv4.' prefix.
     this.set('ipConfig_.' + field, value);
+    // This will also set IPAddressConfigType to STATIC.
     this.fire('ip-change', {
       field: 'StaticIPConfig',
       value: this.getIPConfigProperties_(this.ipConfig_.ipv4)
     });
   },
 });