MD Settings: Internet: Add 'forget' button, more fixes.

chrome/browser/resources/settings/internet_page/internet_detail_page.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
  * 'settings-internet-detail' is the settings subpage containing details
  * for a network.
  */
 (function() {
@@ skipping 96 matching lines @@
   networksChangedListener_: function() {},
 
   /** @override */
   attached: function() {
     this.networksChangedListener_ = this.onNetworksChangedEvent_.bind(this);
     this.networkingPrivate.onNetworksChanged.addListener(
         this.networksChangedListener_);
   },
 
   /** @override */
+  ready: function() {
+    if (!this.guid)
+      this.close_();
+  },
+
+  /** @override */
   detached: function() {
     this.networkingPrivate.onNetworksChanged.removeListener(
         this.networksChangedListener_);
   },
 
   /** @private */
+  close_: function() {
+    // Delay sending subpage-back until the next render frame to allow other
+    // subpages to load first.
+    setTimeout(function() {
+      this.fire('subpage-back');
+    }.bind(this));

[dschuyler, 2016/07/28 22:03:55]

setTimeout and async come up as problems often
enough that I'd like to ask if there is another
way to handle this in a more bulletproof way?
Is there an event to watch for before executing
this rather than using a timeout?

[stevenjb, 2016/07/28 22:15:50]

I tried many things, but nothing else worked reliably. I'm open to suggestions.
I can also ask Michael for suggestions when I am back in SF next week.

[dschuyler, 2016/07/29 23:13:31]

Based on the conversation in the stand-up this morning,
setTimeout is more acceptable that I realized. I do wish
for a better way though.

[stevenjb, 2016/08/02 23:40:34]

Acknowledged.

+  },
+
+  /** @private */
   guidChanged_: function() {
     if (!this.guid)
-      return;
+      this.close_();
     this.getNetworkDetails_();
   },
 
   /** @private */
   networkPropertiesChanged_: function() {
     if (!this.networkProperties)
       return;
 
     // Update autoConnect if it has changed. Default value is false.
     var autoConnect = CrOnc.getAutoConnect(this.networkProperties);
@@ skipping 55 matching lines @@
   /**
    * networkingPrivate.getProperties callback.
    * @param {CrOnc.NetworkProperties} properties The network properties.
    * @private
    */
   getPropertiesCallback_: function(properties) {
     this.networkProperties = properties;
     if (!properties) {
       // If |properties| becomes null (i.e. the network is no longer visible),
       // close the page.
-      this.fire('close');
+      this.close_();
     }
   },
 
   /**
    * @param {!chrome.networkingPrivate.NetworkConfigProperties} onc The ONC
    *     network properties.
    * @private
    */
   setNetworkProperties_: function(onc) {
     if (!this.guid)
@@ skipping 78 matching lines @@
   showDisconnect_: function(networkProperties) {
     return networkProperties.Type != CrOnc.Type.ETHERNET &&
         networkProperties.ConnectionState !=
         CrOnc.ConnectionState.NOT_CONNECTED;
   },
 
   /**
    * @return {boolean}
    * @private
    */
+  showForget_: function(networkProperties) {

[dschuyler, 2016/07/28 22:03:55]

@param for networkProperties.

[stevenjb, 2016/07/28 22:15:50]

Not needed for declared properties. Closure is smart enough to figure it out.
Demitri and I discussed this previously and agreed that it's much simpler
without the @param entries for declared properties, but we can discuss this at
Friday's standup if you're concerned.

[stevenjb, 2016/08/02 23:40:34]

Now using this.networkProperties, parameter removed.

+    var type = networkProperties.Type;
+    if (type != CrOnc.Type.WI_FI && type != CrOnc.Type.VPN)
+      return false;
+    return this.isRemembered_(networkProperties);
+  },
+
+  /**
+   * @return {boolean}
+   * @private
+   */
   showActivate_: function(networkProperties) {

[dschuyler, 2016/07/28 22:03:55]

@param

[stevenjb, 2016/07/28 22:15:50]

Acknowledged.

     if (networkProperties.Type != CrOnc.Type.CELLULAR)
       return false;
     var activation = networkProperties.Cellular.ActivationState;
     return activation == CrOnc.ActivationState.NOT_ACTIVATED ||
         activation == CrOnc.ActivationState.PARTIALLY_ACTIVATED;
   },
 
   /**
    * @return {boolean}
    * @private
@@ skipping 50 matching lines @@
   onConnectTap_: function() {
     this.networkingPrivate.startConnect(this.guid);
   },
 
   /** @private */
   onDisconnectTap_: function() {
     this.networkingPrivate.startDisconnect(this.guid);
   },
 
   /** @private */
+  onForgetTap_: function() {
+    this.networkingPrivate.forgetNetwork(this.guid);
+  },
+
+  /** @private */
   onActivateTap_: function() {
     this.networkingPrivate.startActivate(this.guid);
   },
 
   /** @private */
   onViewAccountTap_: function() {
     // startActivate() will show the account page for activated networks.
     this.networkingPrivate.startActivate(this.guid);
   },
 
@@ skipping 318 matching lines @@
    */
   allPropertiesMatch_: function(curValue, newValue) {
     for (let key in newValue) {
       if (newValue[key] != curValue[key])
         return false;
     }
     return true;
   }
 });
 })();