summaryrefslogtreecommitdiffstats
path: root/chromeos/network/network_state.cc
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-11-05 18:08:00 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-06 02:08:48 +0000
commit129ec916768c0ee459507840c72e4123817e1fbd (patch)
treef17be38484267a78ec9f7bb4c3065ac78d895f2c /chromeos/network/network_state.cc
parentaba3cd0fad04fb412eeba2f93f1760242349bcee (diff)
downloadchromium_src-129ec916768c0ee459507840c72e4123817e1fbd.zip
chromium_src-129ec916768c0ee459507840c72e4123817e1fbd.tar.gz
chromium_src-129ec916768c0ee459507840c72e4123817e1fbd.tar.bz2
Add Dynamic WEP support to wifi config UI
BUG=551666 Review URL: https://codereview.chromium.org/1406933005 Cr-Commit-Position: refs/heads/master@{#358233}
Diffstat (limited to 'chromeos/network/network_state.cc')
-rw-r--r--chromeos/network/network_state.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index f86902a..a71a1ce 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, &security_class_);
} else if (key == shill::kEapMethodProperty) {
return GetStringValue(key, value, &eap_method_);
+ } else if (key == shill::kEapKeyMgmtProperty) {
+ return GetStringValue(key, value, &eap_key_mgmt_);
} else if (key == shill::kNetworkTechnologyProperty) {
return GetStringValue(key, value, &network_technology_);
} else if (key == shill::kDeviceProperty) {
@@ -336,6 +338,11 @@ std::string NetworkState::connection_state() const {
return connection_state_;
}
+bool NetworkState::IsDynamicWep() const {
+ return security_class_ == shill::kSecurityWep &&
+ eap_key_mgmt_ == shill::kKeyManagementIEEE8021X;
+}
+
bool NetworkState::IsConnectedState() const {
return visible() && StateIsConnected(connection_state_);
}