Settings: Internet page cleanup

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 100 matching lines @@
     },
 
     /** @private */
     advancedExpanded_: Boolean,
 
     /** @private */
     networkExpanded_: Boolean,
 
     /** @private */
     proxyExpanded_: Boolean,
-
-    /**
-     * Object providing network type values for data binding.
-     * @const
-     * @private
-     */
-    NetworkType_: {
-      type: Object,
-      value: {
-        CELLULAR: CrOnc.Type.CELLULAR,
-        ETHERNET: CrOnc.Type.ETHERNET,
-        TETHER: CrOnc.Type.TETHER,
-        VPN: CrOnc.Type.VPN,
-        WIFI: CrOnc.Type.WI_FI,
-        WIMAX: CrOnc.Type.WI_MAX,
-      },
-      readOnly: true
-    },
   },
 
   /**
    * Listener function for chrome.networkingPrivate.onNetworksChanged event.
    * @type {?function(!Array<string>)}
    * @private
    */
   networksChangedListener_: null,
 
   /** @private {boolean} */
@@ skipping 61 matching lines @@
       Type: type,
       ConnectionState: CrOnc.ConnectionState.NOT_CONNECTED,
       Name: {Active: name},
     };
     this.didSetFocus_ = false;
     this.getNetworkDetails_();
   },
 
   /** @private */
   close_: function() {
-    // Delay navigating until the next render frame to allow other subpages to
-    // load first.
-    setTimeout(function() {
-      settings.navigateTo(settings.Route.INTERNET);
+    // Delay navigating to allow other subpages to load first.
+    requestAnimationFrame(function() {
+      settings.navigateToPreviousRoute();
     });
   },
 
   /** @private */
   networkPropertiesChanged_: function() {
     if (!this.networkProperties)
       return;
 
     // Update autoConnect if it has changed. Default value is false.
     var autoConnect = CrOnc.getAutoConnect(this.networkProperties);
@@ skipping 71 matching lines @@
       this.networkingPrivate.getState(
           this.guid, this.getStateCallback_.bind(this));
     } else {
       this.networkingPrivate.getManagedProperties(
           this.guid, this.getPropertiesCallback_.bind(this));
     }
   },
 
   /**
    * networkingPrivate.getProperties callback.
-   * @param {CrOnc.NetworkProperties} properties The network properties.
+   * @param {!CrOnc.NetworkProperties} properties The network properties.
    * @private
    */
   getPropertiesCallback_: function(properties) {
     if (chrome.runtime.lastError) {
       var message = chrome.runtime.lastError.message;
       if (message == 'Error.InvalidNetworkGuid') {
         console.error('Details page: GUID no longer exists: ' + this.guid);
       } else {
         console.error(
             'Unexpected networkingPrivate.getManagedProperties error: ' +
@@ skipping 652 matching lines @@
    */
   hasNetworkSection_: function(networkProperties) {
     if (networkProperties.Type == CrOnc.Type.VPN)
       return false;
     if (networkProperties.Type == CrOnc.Type.CELLULAR)
       return true;
     return this.isRememberedOrConnected_(networkProperties);
   },
 
   /**
-   * @param {string} type The network type.
-   * @param {!CrOnc.NetworkProperties} networkProperties
-   * @return {boolean} True if the network type matches 'type'.
-   * @private
-   */
-  isType_: function(type, networkProperties) {
-    return networkProperties.Type == type;
-  },
-
-  /**
    * @param {!CrOnc.NetworkProperties} networkProperties
    * @return {boolean}
    * @private
    */
   showCellularSim_: function(networkProperties) {
     if (networkProperties.Type != 'Cellular' ||
         !networkProperties.Cellular) {
       return false;
     }
     return networkProperties.Cellular.Family == 'GSM';
@@ skipping 10 matching lines @@
    */
   allPropertiesMatch_: function(curValue, newValue) {
     for (var key in newValue) {
       if (newValue[key] != curValue[key])
         return false;
     }
     return true;
   }
 });
 })();