diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-26 12:15:06 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-26 20:41:55 +0100 |
| commit | 3dff810fe0cc4962a5fa554318e9bf8bc45f5274 (patch) | |
| tree | a9fffa9ab7d061ab00538c18beb77403547378d0 /chrome/browser/resources/options | |
| parent | 67d814a5d5c8d7df4740db4d2d74d0a41f94bece (diff) | |
| download | external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.zip external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.tar.gz external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.tar.bz2 | |
Merge Chromium at 12.0.742.130: Initial merge by git
Fix for bug 5080607 Update external/chromium to latest revision
Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
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); |