| 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 f9fc5b0601e001e05ba5b1c7c5b1246c5a1ab049..f6f4a425841d90868469c5eff4b8b8aa0031dadf 100644
|
| --- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js
|
| +++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
|
| @@ -32,9 +32,25 @@ Polymer({
|
| },
|
|
|
| /**
|
| + * Highest priority connected network or null.
|
| + * @type {?CrOnc.NetworkStateProperties}
|
| + */
|
| + defaultNetwork: {
|
| + type: Object,
|
| + value: null,
|
| + },
|
| +
|
| + /**
|
| + * Interface for networkingPrivate calls, passed from internet_page.
|
| + * @type {NetworkingPrivate}
|
| + */
|
| + networkingPrivate: Object,
|
| +
|
| + /**
|
| * The network AutoConnect state.
|
| + * @private
|
| */
|
| - autoConnect: {
|
| + autoConnect_: {
|
| type: Boolean,
|
| value: false,
|
| observer: 'autoConnectChanged_',
|
| @@ -42,8 +58,9 @@ Polymer({
|
|
|
| /**
|
| * The network preferred state.
|
| + * @private
|
| */
|
| - preferNetwork: {
|
| + preferNetwork_: {
|
| type: Boolean,
|
| value: false,
|
| observer: 'preferNetworkChanged_',
|
| @@ -51,28 +68,22 @@ Polymer({
|
|
|
| /**
|
| * The network IP Address.
|
| + * @private
|
| */
|
| - IPAddress: {
|
| + IPAddress_: {
|
| type: String,
|
| value: '',
|
| },
|
|
|
| - /**
|
| - * Highest priority connected network or null.
|
| - * @type {?CrOnc.NetworkStateProperties}
|
| - */
|
| - defaultNetwork: {
|
| - type: Object,
|
| - value: null,
|
| - },
|
| -
|
| - advancedExpanded: {type: Boolean},
|
| + /** @private */
|
| + advancedExpanded_: Boolean,
|
|
|
| /**
|
| * Object providing network type values for data binding.
|
| * @const
|
| + * @private
|
| */
|
| - NetworkType: {
|
| + NetworkType_: {
|
| type: Object,
|
| value: {
|
| CELLULAR: CrOnc.Type.CELLULAR,
|
| @@ -83,12 +94,6 @@ Polymer({
|
| },
|
| readOnly: true
|
| },
|
| -
|
| - /**
|
| - * Interface for networkingPrivate calls, passed from internet_page.
|
| - * @type {NetworkingPrivate}
|
| - */
|
| - networkingPrivate: {type: Object},
|
| },
|
|
|
| /**
|
| @@ -142,20 +147,20 @@ Polymer({
|
|
|
| // Update autoConnect if it has changed. Default value is false.
|
| var autoConnect = CrOnc.getAutoConnect(this.networkProperties);
|
| - if (autoConnect != this.autoConnect)
|
| - this.autoConnect = autoConnect;
|
| + if (autoConnect != this.autoConnect_)
|
| + this.autoConnect_ = autoConnect;
|
|
|
| // Update preferNetwork if it has changed. Default value is false.
|
| var priority = /** @type {number} */ (
|
| CrOnc.getActiveValue(this.networkProperties.Priority) || 0);
|
| var preferNetwork = priority > 0;
|
| - if (preferNetwork != this.preferNetwork)
|
| - this.preferNetwork = preferNetwork;
|
| + if (preferNetwork != this.preferNetwork_)
|
| + this.preferNetwork_ = preferNetwork;
|
|
|
| // Set the IPAddress property to the IPV4 Address.
|
| var ipv4 =
|
| CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV4);
|
| - this.IPAddress = (ipv4 && ipv4.IPAddress) || '';
|
| + this.IPAddress_ = (ipv4 && ipv4.IPAddress) || '';
|
|
|
| // Update the detail page title.
|
| this.parentNode.pageTitle =
|
| @@ -167,7 +172,7 @@ Polymer({
|
| if (!this.networkProperties || !this.guid)
|
| return;
|
| var onc = this.getEmptyNetworkProperties_();
|
| - CrOnc.setTypeProperty(onc, 'AutoConnect', this.autoConnect);
|
| + CrOnc.setTypeProperty(onc, 'AutoConnect', this.autoConnect_);
|
| this.setNetworkProperties_(onc);
|
| },
|
|
|
| @@ -176,7 +181,7 @@ Polymer({
|
| if (!this.networkProperties || !this.guid)
|
| return;
|
| var onc = this.getEmptyNetworkProperties_();
|
| - onc.Priority = this.preferNetwork ? 1 : 0;
|
| + onc.Priority = this.preferNetwork_ ? 1 : 0;
|
| this.setNetworkProperties_(onc);
|
| },
|
|
|
| @@ -424,7 +429,7 @@ Polymer({
|
| toggleAdvancedExpanded_: function(event) {
|
| if (event.target.id == 'expandButton')
|
| return; // Already handled.
|
| - this.advancedExpanded = !this.advancedExpanded;
|
| + this.advancedExpanded_ = !this.advancedExpanded_;
|
| },
|
|
|
| /**
|
|
|