Index: chrome/browser/resources/settings/internet_page/internet_detail_page.js |
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.js b/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
index 064757041f3459e284dffa493d3c90f03eb878e0..395090654201415ed3270b126efc57307a806a66 100644 |
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
@@ -118,24 +118,6 @@ Polymer({ |
/** @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 |
- }, |
}, |
/** |
@@ -217,10 +199,9 @@ Polymer({ |
/** @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(); |
}); |
}, |
@@ -312,7 +293,7 @@ Polymer({ |
/** |
* networkingPrivate.getProperties callback. |
- * @param {CrOnc.NetworkProperties} properties The network properties. |
+ * @param {!CrOnc.NetworkProperties} properties The network properties. |
* @private |
*/ |
getPropertiesCallback_: function(properties) { |
@@ -985,16 +966,6 @@ Polymer({ |
}, |
/** |
- * @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 |