summaryrefslogtreecommitdiffstats
path: root/chromeos/network/network_state.cc
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 16:28:13 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 16:28:13 +0000
commitebecfb068bcfc514f5d4310acd6b6b5b9c772a77 (patch)
treea8a1fa9f3f066404d4b67bccc3a2b2b3e57dd351 /chromeos/network/network_state.cc
parentd7a7c8066134dc6e736ee8a16117cd66c6b8d92e (diff)
downloadchromium_src-ebecfb068bcfc514f5d4310acd6b6b5b9c772a77.zip
chromium_src-ebecfb068bcfc514f5d4310acd6b6b5b9c772a77.tar.gz
chromium_src-ebecfb068bcfc514f5d4310acd6b6b5b9c772a77.tar.bz2
Use EapMethod to provide correct network error message
BUG=297374 R=pneubeck@chromium.org Review URL: https://codereview.chromium.org/24644005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_state.cc')
-rw-r--r--chromeos/network/network_state.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index 6c41f41..ae779de 100644
--- a/chromeos/network/network_state.cc
+++ b/chromeos/network/network_state.cc
@@ -126,6 +126,8 @@ bool NetworkState::PropertyChanged(const std::string& key,
return GetStringValue(key, value, &roaming_);
} else if (key == shill::kSecurityProperty) {
return GetStringValue(key, value, &security_);
+ } else if (key == shill::kEapMethodProperty) {
+ return GetStringValue(key, value, &eap_method_);
} else if (key == shill::kUIDataProperty) {
scoped_ptr<NetworkUIData> new_ui_data =
shill_property_util::GetUIDataFromValue(value);
@@ -196,6 +198,8 @@ void NetworkState::GetProperties(base::DictionaryValue* dictionary) const {
roaming_);
dictionary->SetStringWithoutPathExpansion(shill::kSecurityProperty,
security_);
+ dictionary->SetStringWithoutPathExpansion(shill::kEapMethodProperty,
+ eap_method_);
// Proxy config and ONC source are intentionally omitted: These properties are
// placed in NetworkState to transition ProxyConfigServiceImpl from
// NetworkLibrary to the new network stack. The networking extension API