Suppress network configuration UI when third-party VPN times out

ui/chromeos/network/network_connect.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/chromeos/network/network_connect.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 124 matching lines @@
   }
 
   if (network->type() == shill::kTypeWifi) {
     // Only show the config view for secure networks, otherwise do nothing.
     if (network->security_class() != shill::kSecurityNone) {
       delegate_->ShowNetworkConfigure(service_path);
     }
     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);
       return;
     }
     if (network->cellular_out_of_credits()) {
       ShowMobileSetup(service_path);
       return;
     }
     // No special configure or setup for |network|, show the settings UI.
@@ skipping 478 matching lines @@
   return g_network_connect;
 }
 
 NetworkConnect::NetworkConnect() {
 }
 
 NetworkConnect::~NetworkConnect() {
 }
 
 }  // namespace ui