Index: chrome/browser/chromeos/cros/network_library_impl_stub.cc |
diff --git a/chrome/browser/chromeos/cros/network_library_impl_stub.cc b/chrome/browser/chromeos/cros/network_library_impl_stub.cc |
index 99900007500656bc0f60f76dbba130d0cdde7c1a..eedd5e16d5d2dd10853e3cd52d22ac58a9e4530c 100644 |
--- a/chrome/browser/chromeos/cros/network_library_impl_stub.cc |
+++ b/chrome/browser/chromeos/cros/network_library_impl_stub.cc |
@@ -385,16 +385,23 @@ void NetworkLibraryImplStub::AddStubRememberedNetwork(Network* network) { |
} |
void NetworkLibraryImplStub::ConnectToNetwork(Network* network) { |
+ std::string passphrase; |
if (network->type() == TYPE_WIFI) { |
WifiNetwork* wifi = static_cast<WifiNetwork*>(network); |
- if (wifi->encryption() != SECURITY_NONE) { |
- if (wifi->passphrase().find("bad") == 0) { |
- NetworkConnectCompleted(network, CONNECT_BAD_PASSPHRASE); |
- return; |
- } else if (wifi->passphrase().find("error") == 0) { |
- NetworkConnectCompleted(network, CONNECT_FAILED); |
- return; |
- } |
+ if (wifi->passphrase_required()) |
+ passphrase = wifi->passphrase(); |
+ } else if (network->type() == TYPE_WIMAX) { |
+ WimaxNetwork* wimax = static_cast<WimaxNetwork*>(network); |
+ if (wimax->passphrase_required()) |
+ passphrase = wimax->eap_passphrase(); |
+ } |
+ if (!passphrase.empty()) { |
+ if (passphrase.find("bad") == 0) { |
oshima
2012/05/18 01:39:13
!passphrase.find("bad")
|
+ NetworkConnectCompleted(network, CONNECT_BAD_PASSPHRASE); |
+ return; |
+ } else if (passphrase.find("error") == 0) { |
oshima
2012/05/18 01:39:13
ditto
|
+ NetworkConnectCompleted(network, CONNECT_FAILED); |
+ return; |
} |
} |