| 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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 this.close_(); | 595 this.close_(); |
| 596 }, | 596 }, |
| 597 | 597 |
| 598 /** @private */ | 598 /** @private */ |
| 599 onActivateTap_: function() { | 599 onActivateTap_: function() { |
| 600 this.networkingPrivate.startActivate(this.guid); | 600 this.networkingPrivate.startActivate(this.guid); |
| 601 }, | 601 }, |
| 602 | 602 |
| 603 /** @private */ | 603 /** @private */ |
| 604 onConfigureTap_: function() { | 604 onConfigureTap_: function() { |
| 605 chrome.send('configureNetwork', [this.guid]); | 605 if (loadTimeData.getBoolean('networkSettingsConfig')) |
| 606 this.fire('show-config', this.networkProperties); |
| 607 else |
| 608 chrome.send('configureNetwork', [this.guid]); |
| 606 }, | 609 }, |
| 607 | 610 |
| 608 /** @private */ | 611 /** @private */ |
| 609 onViewAccountTap_: function() { | 612 onViewAccountTap_: function() { |
| 610 // startActivate() will show the account page for activated networks. | 613 // startActivate() will show the account page for activated networks. |
| 611 this.networkingPrivate.startActivate(this.guid); | 614 this.networkingPrivate.startActivate(this.guid); |
| 612 }, | 615 }, |
| 613 | 616 |
| 614 /** @const {string} */ | 617 /** @const {string} */ |
| 615 CR_EXPAND_BUTTON_TAG: 'CR-EXPAND-BUTTON', | 618 CR_EXPAND_BUTTON_TAG: 'CR-EXPAND-BUTTON', |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 989 */ | 992 */ |
| 990 allPropertiesMatch_: function(curValue, newValue) { | 993 allPropertiesMatch_: function(curValue, newValue) { |
| 991 for (var key in newValue) { | 994 for (var key in newValue) { |
| 992 if (newValue[key] != curValue[key]) | 995 if (newValue[key] != curValue[key]) |
| 993 return false; | 996 return false; |
| 994 } | 997 } |
| 995 return true; | 998 return true; |
| 996 } | 999 } |
| 997 }); | 1000 }); |
| 998 })(); | 1001 })(); |
| OLD | NEW |