summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/login
diff options
context:
space:
mode:
authorchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 17:45:51 +0000
committerchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 17:45:51 +0000
commit145c762733827644c5e871c4357f6760f9a1a21e (patch)
treeb9f4e3de2232b5d0ec603fb4cba9ec0947fd6c90 /chrome/browser/chromeos/login
parent34e44bf6961966ec9b1a4f212d641b293e0cd3af (diff)
downloadchromium_src-145c762733827644c5e871c4357f6760f9a1a21e.zip
chromium_src-145c762733827644c5e871c4357f6760f9a1a21e.tar.gz
chromium_src-145c762733827644c5e871c4357f6760f9a1a21e.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45203 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, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 7468e70..c0c86bb 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -152,7 +152,8 @@ void NetworkScreen::ConnectToNetwork(NetworkList::NetworkType type,
return;
} else {
chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
- ConnectToWifiNetwork(network->wifi_network, string16());
+ ConnectToWifiNetwork(network->wifi_network,
+ string16(), string16(), string16());
}
} else if (NetworkList::NETWORK_CELLULAR == network->network_type) {
chromeos::CrosLibrary::Get()->GetNetworkLibrary()->