| Index: chrome/browser/resources/settings/internet_page/network_nameservers.js
|
| diff --git a/chrome/browser/resources/settings/internet_page/network_nameservers.js b/chrome/browser/resources/settings/internet_page/network_nameservers.js
|
| index 6a9b86fae1309d7b1805d144cd893ca26db007b3..cec1b79e122d21cecc6415778cdc043a749703fb 100644
|
| --- a/chrome/browser/resources/settings/internet_page/network_nameservers.js
|
| +++ b/chrome/browser/resources/settings/internet_page/network_nameservers.js
|
| @@ -19,9 +19,7 @@ Polymer({
|
| observer: 'networkPropertiesChanged_',
|
| },
|
|
|
| - /**
|
| - * Whether or not the nameservers can be edited.
|
| - */
|
| + /** Whether or not the nameservers can be edited. */
|
| editable: {
|
| type: Boolean,
|
| value: false,
|
| @@ -29,9 +27,9 @@ Polymer({
|
|
|
| /**
|
| * Array of nameserver addresses stored as strings.
|
| - * @type {!Array<string>}
|
| + * @private {!Array<string>}
|
| */
|
| - nameservers: {
|
| + nameservers_: {
|
| type: Array,
|
| value: function() {
|
| return [];
|
| @@ -40,14 +38,16 @@ Polymer({
|
|
|
| /**
|
| * The selected nameserver type.
|
| + * @private
|
| */
|
| - nameserversType: {
|
| + nameserversType_: {
|
| type: String,
|
| value: 'automatic',
|
| },
|
|
|
| /**
|
| * Array of nameserver types.
|
| + * @private
|
| */
|
| nameserverTypeNames_: {
|
| type: Array,
|
| @@ -67,7 +67,7 @@ Polymer({
|
|
|
| /**
|
| * Saved nameservers when switching to 'automatic'.
|
| - * @type {!Array<string>}
|
| + * @private {!Array<string>}
|
| */
|
| savedNameservers_: [],
|
|
|
| @@ -108,37 +108,35 @@ Polymer({
|
| * @private
|
| */
|
| setNameservers_: function(nameserversType, nameservers) {
|
| - this.nameserversType = nameserversType;
|
| + this.nameserversType_ = nameserversType;
|
| if (nameserversType == 'custom') {
|
| // Add empty entries for unset custom nameservers.
|
| for (let i = nameservers.length; i < this.MAX_NAMESERVERS; ++i)
|
| nameservers[i] = '';
|
| }
|
| - this.nameservers = nameservers;
|
| + this.nameservers_ = nameservers;
|
| },
|
|
|
| /**
|
| - * @param {string} nameserversType The nameservers type.
|
| - * @return {string} The description for |nameserversType|.
|
| + * @param {string} type The nameservers type.
|
| + * @return {string} The description for |type|.
|
| * @private
|
| */
|
| - nameserverTypeDesc_: function(nameserversType) {
|
| + nameserverTypeDesc_: function(type) {
|
| // TODO(stevenjb): Translate.
|
| - if (nameserversType == 'custom')
|
| + if (type == 'custom')
|
| return 'Custom name servers';
|
| - if (nameserversType == 'google')
|
| + if (type == 'google')
|
| return 'Google name servers';
|
| return 'Automatic name servers';
|
| },
|
|
|
| /**
|
| - * @param {boolean} editable The editable state.
|
| - * @param {string} nameserversType The nameservers type.
|
| * @return {boolean} True if the nameservers are editable.
|
| * @private
|
| */
|
| - canEdit_: function(editable, nameserversType) {
|
| - return editable && nameserversType == 'custom';
|
| + canEdit_: function() {
|
| + return this.editable && this.nameserversType_ == 'custom';
|
| },
|
|
|
| /**
|
| @@ -148,10 +146,10 @@ Polymer({
|
| * @private
|
| */
|
| onTypeChange_: function(e) {
|
| - if (this.nameserversType == 'custom')
|
| - this.savedNameservers_ = this.nameservers;
|
| + if (this.nameserversType_ == 'custom')
|
| + this.savedNameservers_ = this.nameservers_;
|
| var type = e.detail.selected;
|
| - this.nameserversType = type;
|
| + this.nameserversType_ = type;
|
| if (type == 'custom') {
|
| // Restore the saved nameservers.
|
| this.setNameservers_(type, this.savedNameservers_);
|
| @@ -167,7 +165,7 @@ Polymer({
|
| * @private
|
| */
|
| onValueChange_: function() {
|
| - if (this.nameserversType != 'custom') {
|
| + if (this.nameserversType_ != 'custom') {
|
| // If a user inputs Google nameservers in the custom nameservers fields,
|
| // |nameserversType| will change to 'google' so don't send the values.
|
| return;
|
| @@ -180,7 +178,7 @@ Polymer({
|
| * @private
|
| */
|
| sendNameServers_: function() {
|
| - var type = this.nameserversType;
|
| + var type = this.nameserversType_;
|
|
|
| if (type == 'custom') {
|
| let nameservers = [];
|
|
|