diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 08:51:59 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 08:51:59 +0000 |
| commit | 961d8745428eb0ab97c89c7b6a7c56ce1506a8be (patch) | |
| tree | 46152c8eeaa3b22d4aed93120d9d5422f20d8538 | |
| parent | d63977706b4d321f6e50ae56a7c7158eec91344f (diff) | |
| download | chromium_src-961d8745428eb0ab97c89c7b6a7c56ce1506a8be.zip chromium_src-961d8745428eb0ab97c89c7b6a7c56ce1506a8be.tar.gz chromium_src-961d8745428eb0ab97c89c7b6a7c56ce1506a8be.tar.bz2 | |
Merge 202468 "Fix incorrect loadTimeData checks in internet_deta..."
> Fix incorrect loadTimeData checks in internet_details.js.
>
> BUG=241840
>
> Review URL: https://chromiumcodereview.appspot.com/15997006
TBR=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/16222003
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@203115 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/options/chromeos/internet_detail.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js index 7cd2d10..5033dd5 100644 --- a/chrome/browser/resources/options/chromeos/internet_detail.js +++ b/chrome/browser/resources/options/chromeos/internet_detail.js @@ -288,7 +288,7 @@ cr.define('options.internet', function() { // stored) is not accessible from the login screen. // TODO(pneubeck): Remove this once i18n of the proxy dialog on the login // page is fixed. http://crbug.com/242865 - if (loadTimeData.data) { + if (loadTimeData.data_) { $('google-dns-label').innerHTML = loadTimeData.getString('googleNameServers'); } @@ -405,7 +405,7 @@ cr.define('options.internet', function() { */ updateProxyBannerVisibility_: function() { var bannerDiv = $('network-proxy-info-banner'); - if (!loadTimeData.data) { + if (!loadTimeData.data_) { // TODO(pneubeck): This temporarily prevents an exception below until // i18n of the proxy dialog on the login page is // fixed. http://crbug.com/242865 |