OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 /** | 5 /** |
6 * @fileoverview | 6 * @fileoverview |
7 * 'settings-internet-detail' is the settings subpage containing details | 7 * 'settings-internet-detail' is the settings subpage containing details |
8 * for a network. | 8 * for a network. |
9 */ | 9 */ |
10 (function() { | 10 (function() { |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 }, | 397 }, |
398 | 398 |
399 /** @private */ | 399 /** @private */ |
400 onDisconnectTap_: function() { | 400 onDisconnectTap_: function() { |
401 this.networkingPrivate.startDisconnect(this.guid); | 401 this.networkingPrivate.startDisconnect(this.guid); |
402 }, | 402 }, |
403 | 403 |
404 /** @private */ | 404 /** @private */ |
405 onForgetTap_: function() { | 405 onForgetTap_: function() { |
406 this.networkingPrivate.forgetNetwork(this.guid); | 406 this.networkingPrivate.forgetNetwork(this.guid); |
| 407 // A forgotten WiFi network can still be configured, but not other types. |
| 408 if (this.networkProperties.Type != CrOnc.Type.WI_FI) |
| 409 this.close_(); |
407 }, | 410 }, |
408 | 411 |
409 /** @private */ | 412 /** @private */ |
410 onActivateTap_: function() { | 413 onActivateTap_: function() { |
411 this.networkingPrivate.startActivate(this.guid); | 414 this.networkingPrivate.startActivate(this.guid); |
412 }, | 415 }, |
413 | 416 |
414 /** @private */ | 417 /** @private */ |
415 onConfigureTap_: function() { | 418 onConfigureTap_: function() { |
416 chrome.send('configureNetwork', [this.guid]); | 419 chrome.send('configureNetwork', [this.guid]); |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 'Cellular.IMEI', 'Cellular.IMSI', 'Cellular.MDN', 'Cellular.MEID', | 674 'Cellular.IMEI', 'Cellular.IMSI', 'Cellular.MDN', 'Cellular.MEID', |
672 'Cellular.MIN', 'Cellular.PRLVersion'); | 675 'Cellular.MIN', 'Cellular.PRLVersion'); |
673 } | 676 } |
674 return fields; | 677 return fields; |
675 }, | 678 }, |
676 | 679 |
677 /** | 680 /** |
678 * @return {boolean} | 681 * @return {boolean} |
679 * @private | 682 * @private |
680 */ | 683 */ |
681 hasAdvancedOrDeviceFields_: function() { | 684 showAdvanced_: function() { |
682 return this.hasAdvancedFields_() || this.hasDeviceFields_(); | 685 return this.hasAdvancedFields_() || this.hasDeviceFields_() || |
| 686 this.isRememberedOrConnected_(); |
683 }, | 687 }, |
684 | 688 |
685 /** | 689 /** |
686 * @return {boolean} | 690 * @return {boolean} |
687 * @private | 691 * @private |
688 */ | 692 */ |
689 hasAdvancedFields_: function() { | 693 hasAdvancedFields_: function() { |
690 return this.hasVisibleFields_(this.getAdvancedFields_()); | 694 return this.hasVisibleFields_(this.getAdvancedFields_()); |
691 }, | 695 }, |
692 | 696 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 */ | 746 */ |
743 allPropertiesMatch_: function(curValue, newValue) { | 747 allPropertiesMatch_: function(curValue, newValue) { |
744 for (let key in newValue) { | 748 for (let key in newValue) { |
745 if (newValue[key] != curValue[key]) | 749 if (newValue[key] != curValue[key]) |
746 return false; | 750 return false; |
747 } | 751 } |
748 return true; | 752 return true; |
749 } | 753 } |
750 }); | 754 }); |
751 })(); | 755 })(); |
OLD | NEW |