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 7e84ed7cdf0a63eb1811cd5c40df3c1bc7db023e..064757041f3459e284dffa493d3c90f03eb878e0 100644 |
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js |
@@ -149,19 +149,23 @@ Polymer({ |
didSetFocus_: false, |
/** |
+ * Set to true to once the initial properties have been received. This |
+ * prevents setProperties from being called when setting default properties. |
+ * @private {boolean} |
+ */ |
+ networkPropertiesReceived_: false, |
+ |
+ /** |
* Set in currentRouteChanged() if the showConfigure URL query |
* parameter is set to true. The dialog cannot be shown until the |
- * network properties have been fetched in |
- * networkPropertiesChanged_(). |
- * @type {boolean} |
- * @private |
+ * network properties have been fetched in networkPropertiesChanged_(). |
+ * @private {boolean} |
*/ |
shoudlShowConfigureWhenNetworkLoaded_: false, |
/** |
* Whether the previous route was also the network detail page. |
- * @type {boolean} |
- * @private |
+ * @private {boolean} |
*/ |
wasPreviousRouteNetworkDetailPage_: false, |
@@ -192,6 +196,7 @@ Polymer({ |
this.close_(); |
} |
// Set basic networkProperties until they are loaded. |
+ this.networkPropertiesReceived_ = false; |
var type = /** @type {!chrome.networkingPrivate.NetworkType} */ ( |
queryParams.get('type')) || |
CrOnc.Type.WI_FI; |
@@ -329,6 +334,7 @@ Polymer({ |
return; |
} |
this.networkProperties = properties; |
+ this.networkPropertiesReceived_ = true; |
}, |
/** |
@@ -349,6 +355,7 @@ Polymer({ |
Connectable: state.Connectable, |
ConnectionState: state.ConnectionState, |
}; |
+ this.networkPropertiesReceived_ = true; |
}, |
/** |
@@ -357,6 +364,9 @@ Polymer({ |
* @private |
*/ |
setNetworkProperties_: function(onc) { |
+ if (!this.networkPropertiesReceived_) |
+ return; |
+ |
assert(!!this.guid); |
this.networkingPrivate.setProperties(this.guid, onc, function() { |
if (chrome.runtime.lastError) { |