Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: chromeos/network/network_connection_handler.cc

Issue 788633003: chromeos networking: move from security to securityclass property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/network_connection_handler.cc
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index 6d2bc5994c67a355d58def885264b131156366d0..a4e17edd33b042a94f66cdfe7de64c29a5862fa7 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -91,7 +91,7 @@ std::string GetDefaultUserProfilePath(const NetworkState* network) {
(LoginState::IsInitialized() &&
!LoginState::Get()->UserHasNetworkProfile()) ||
(network && network->type() == shill::kTypeWifi &&
- network->security() == shill::kSecurityNone)) {
+ network->security_class() == shill::kSecurityNone)) {
return NetworkProfileHandler::GetSharedProfilePath();
}
const NetworkProfile* profile =
@@ -368,10 +368,10 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
return;
}
- std::string type, security;
+ std::string type, security_class;
service_properties.GetStringWithoutPathExpansion(shill::kTypeProperty, &type);
service_properties.GetStringWithoutPathExpansion(
- shill::kSecurityProperty, &security);
+ shill::kSecurityClassProperty, &security_class);
bool connectable = false;
service_properties.GetBooleanWithoutPathExpansion(
shill::kConnectableProperty, &connectable);
@@ -437,7 +437,8 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
client_cert_type = client_cert::CONFIG_TYPE_IPSEC;
}
}
- } else if (type == shill::kTypeWifi && security == shill::kSecurity8021x) {
+ } else if (type == shill::kTypeWifi &&
+ security_class == shill::kSecurity8021x) {
client_cert_type = client_cert::CONFIG_TYPE_EAP;
}

Powered by Google App Engine
This is Rietveld 408576698