diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 17:47:34 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 17:47:34 +0000 |
| commit | 80e996cf4c7005abae6b559533f9fa9e25f790ad (patch) | |
| tree | 2b6b9de5a5993eeb1f43876f3d9158bc3d7befc9 | |
| parent | 361fe8abbf9d24b4f7d6dfe011034205b8a57c01 (diff) | |
| download | chromium_src-80e996cf4c7005abae6b559533f9fa9e25f790ad.zip chromium_src-80e996cf4c7005abae6b559533f9fa9e25f790ad.tar.gz chromium_src-80e996cf4c7005abae6b559533f9fa9e25f790ad.tar.bz2 | |
Check "connectable" flag when adding "Connect" button.
BUG=chromium-os:9600
TEST=Verify "Connect" button does not show up for non-connectable networks per chromium-os:9600.
Review URL: http://codereview.chromium.org/5374002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67276 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/options/chromeos_internet_network_element.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/chromeos_internet_network_element.js b/chrome/browser/resources/options/chromeos_internet_network_element.js index 9f73284..8498005 100644 --- a/chrome/browser/resources/options/chromeos_internet_network_element.js +++ b/chrome/browser/resources/options/chromeos_internet_network_element.js @@ -234,8 +234,9 @@ cr.define('options.internet', function() { self.data.servicePath, 'options']); })); - } else if (!this.data.connecting) { - // connect button (if not ethernet and not showing activate button) + } else if (!this.data.connecting && this.data.connectable) { + // connect button (if not ethernet and not showing activate button + // and connectable) if (this.data.networkType != NetworkItem.TYPE_ETHERNET && !show_activate && !no_plan) { buttonsDiv.appendChild( |