Commit f9f15519 authored by emaxx's avatar emaxx Committed by Commit bot

Suppress network configuration UI when third-party VPN times out

BUG=470835

Review URL: https://codereview.chromium.org/1034923002

Cr-Commit-Position: refs/heads/master@{#322397}
parent 73a470e3
...@@ -142,8 +142,14 @@ void NetworkConnectImpl::HandleUnconfiguredNetwork( ...@@ -142,8 +142,14 @@ void NetworkConnectImpl::HandleUnconfiguredNetwork(
return; return;
} }
if (network->type() == shill::kTypeWimax || if (network->type() == shill::kTypeWimax) {
network->type() == shill::kTypeVPN) { delegate_->ShowNetworkConfigure(service_path);
return;
}
if (network->type() == shill::kTypeVPN) {
// Third-party VPNs handle configuration UI themselves.
if (network->vpn_provider_type() != shill::kProviderThirdPartyVpn)
delegate_->ShowNetworkConfigure(service_path); delegate_->ShowNetworkConfigure(service_path);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment