diff options
Diffstat (limited to 'chrome/browser/resources/options')
| -rw-r--r-- | chrome/browser/resources/options/chromeos/internet_options.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/resources/options/chromeos/internet_options.js b/chrome/browser/resources/options/chromeos/internet_options.js index 4902f1d..a802a9b 100644 --- a/chrome/browser/resources/options/chromeos/internet_options.js +++ b/chrome/browser/resources/options/chromeos/internet_options.js @@ -404,9 +404,18 @@ cr.define('options', function() { $('operatorName').textContent = data.operatorName; $('operatorCode').textContent = data.operatorCode; $('imsi').textContent = data.imsi; - $('cellularApn').value = data.apn; - $('cellularApnUsername').value = data.apn_username; - $('cellularApnPassword').value = data.apn_password; + // If there's no custom APN show default APN that is used. These will be + // displayed differently when http://crosbug.com/14290 is fixed. + // See also http://crosbug.com/p/4058 for context. + if (data.apn != '') { + $('cellularApn').value = data.apn; + $('cellularApnUsername').value = data.apn_username; + $('cellularApnPassword').value = data.apn_password; + } else { + $('cellularApn').value = data.last_good_apn; + $('cellularApnUsername').value = data.last_good_apn_username; + $('cellularApnPassword').value = data.last_good_apn_password; + } $('sim-card-lock-enabled').checked = data.simCardLockEnabled; InternetOptions.enableSecurityTab(true); page.setAttribute('gsm', true); |