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

Unified Diff: ui/chromeos/network/network_connect.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: rebase, resolve conflicts, update new test data (shill_wifi_dhcp.json) Created 5 years, 11 months 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
« no previous file with comments | « components/wifi_sync/network_state_helper_chromeos.cc ('k') | ui/chromeos/network/network_icon.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/network/network_connect.cc
diff --git a/ui/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc
index e1d98566c0c6661e05b321bbb1fa57fdc91fdb67..a7cb0aee47fed181e373814c535bec71365fc58c 100644
--- a/ui/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -136,7 +136,7 @@ void NetworkConnectImpl::HandleUnconfiguredNetwork(
if (network->type() == shill::kTypeWifi) {
// Only show the config view for secure networks, otherwise do nothing.
- if (network->security() != shill::kSecurityNone) {
+ if (network->security_class() != shill::kSecurityNone) {
delegate_->ShowNetworkConfigure(service_path);
}
return;
@@ -377,7 +377,7 @@ void NetworkConnectImpl::ConnectToNetwork(const std::string& service_path) {
NET_LOG_USER("ConnectToNetwork", service_path);
const NetworkState* network = GetNetworkState(service_path);
if (network) {
- if (!network->error().empty() && !network->security().empty()) {
+ if (!network->error().empty() && !network->security_class().empty()) {
NET_LOG_USER("Configure: " + network->error(), service_path);
// If the network is in an error state, show the configuration UI
// directly to avoid a spurious notification.
« no previous file with comments | « components/wifi_sync/network_state_helper_chromeos.cc ('k') | ui/chromeos/network/network_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698