| 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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 /** | 434 /** |
| 435 * @param {!CrOnc.NetworkProperties} networkProperties | 435 * @param {!CrOnc.NetworkProperties} networkProperties |
| 436 * @param {!chrome.networkingPrivate.GlobalPolicy} globalPolicy | 436 * @param {!chrome.networkingPrivate.GlobalPolicy} globalPolicy |
| 437 * @return {boolean} | 437 * @return {boolean} |
| 438 * @private | 438 * @private |
| 439 */ | 439 */ |
| 440 showConfigure_: function(networkProperties, globalPolicy) { | 440 showConfigure_: function(networkProperties, globalPolicy) { |
| 441 if (this.connectNotAllowed_(networkProperties, globalPolicy)) | 441 if (this.connectNotAllowed_(networkProperties, globalPolicy)) |
| 442 return false; | 442 return false; |
| 443 var type = networkProperties.Type; | 443 var type = networkProperties.Type; |
| 444 if (type == CrOnc.Type.CELLULAR || type == CrOnc.Type.WI_MAX) | 444 if (type == CrOnc.Type.CELLULAR) |
| 445 return false; | 445 return false; |
| 446 if (type == CrOnc.Type.WI_FI && | 446 if ((type == CrOnc.Type.WI_FI || type == CrOnc.Type.WI_MAX) && |
| 447 networkProperties.ConnectionState != | 447 networkProperties.ConnectionState != |
| 448 CrOnc.ConnectionState.NOT_CONNECTED) { | 448 CrOnc.ConnectionState.NOT_CONNECTED) { |
| 449 return false; | 449 return false; |
| 450 } | 450 } |
| 451 return this.isRemembered_(networkProperties); | 451 return this.isRemembered_(networkProperties); |
| 452 }, | 452 }, |
| 453 | 453 |
| 454 /** | 454 /** |
| 455 * @param {!CrOnc.NetworkProperties} networkProperties | 455 * @param {!CrOnc.NetworkProperties} networkProperties |
| 456 * @return {boolean} | 456 * @return {boolean} |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 925 */ | 925 */ |
| 926 allPropertiesMatch_: function(curValue, newValue) { | 926 allPropertiesMatch_: function(curValue, newValue) { |
| 927 for (var key in newValue) { | 927 for (var key in newValue) { |
| 928 if (newValue[key] != curValue[key]) | 928 if (newValue[key] != curValue[key]) |
| 929 return false; | 929 return false; |
| 930 } | 930 } |
| 931 return true; | 931 return true; |
| 932 } | 932 } |
| 933 }); | 933 }); |
| 934 })(); | 934 })(); |
| OLD | NEW |