Suppress network configuration UI when third-party VPN times out

ui/chromeos/network/network_connect.cc

Index: ui/chromeos/network/network_connect.cc
diff --git a/ui/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc
index 822239150b385343a2b4371ff9486402ab869cb6..142955b8293f87b7f4f84f818838522d87d37697 100644
--- a/ui/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -142,12 +142,19 @@ void NetworkConnectImpl::HandleUnconfiguredNetwork(
     return;
   }
 
-  if (network->type() == shill::kTypeWimax ||
-      network->type() == shill::kTypeVPN) {
+  if (network->type() == shill::kTypeWimax) {
     delegate_->ShowNetworkConfigure(service_path);
     return;
   }
 
+  if (network->type() == shill::kTypeVPN) {
+    // Third-party VPNs are supposed to do the UI itself.

[stevenjb, 2015/03/26 15:38:02]

nit: Third-party VPNs handle configuration UI themselves.

+    if (network->vpn_provider_type() != shill::kProviderThirdPartyVpn) {
+      delegate_->ShowNetworkConfigure(service_path);
+    }

[stevenjb, 2015/03/26 15:38:02]

nit: no brackets

+    return;
+  }
+
   if (network->type() == shill::kTypeCellular) {
     if (network->RequiresActivation()) {
       ActivateCellular(service_path);