summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/login
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 18:24:29 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 18:24:29 +0000
commit6ade700106737e9218f5a97be11ac0eb6a90b1e1 (patch)
tree4873481c76c28e0c1baee21caf6e01ddeb66aadd /chrome/browser/chromeos/login
parent6e57226ad7bb3dea87f5c12caa2ee06e5062b904 (diff)
downloadchromium_src-6ade700106737e9218f5a97be11ac0eb6a90b1e1.zip
chromium_src-6ade700106737e9218f5a97be11ac0eb6a90b1e1.tar.gz
chromium_src-6ade700106737e9218f5a97be11ac0eb6a90b1e1.tar.bz2
Revert 45203 - Land http://codereview.chromium.org/1676002 for njw
tbr:njw TEST=Compiles and login dialog shows new fields when security is 802.1x BUG=none Review URL: http://codereview.chromium.org/1712003 TBR=chocobo@chromium.org Review URL: http://codereview.chromium.org/1743002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/login')
-rw-r--r--chrome/browser/chromeos/login/network_screen.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index c0c86bb..7468e70 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -152,8 +152,7 @@ void NetworkScreen::ConnectToNetwork(NetworkList::NetworkType type,
return;
} else {
chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
- ConnectToWifiNetwork(network->wifi_network,
- string16(), string16(), string16());
+ ConnectToWifiNetwork(network->wifi_network, string16());
}
} else if (NetworkList::NETWORK_CELLULAR == network->network_type) {
chromeos::CrosLibrary::Get()->GetNetworkLibrary()->