Add ash UI for third-party VPNs

chromeos/network/network_state.cc

 // Copyright (c) 2012 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 "chromeos/network/network_state.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/network/network_profile_handler.h"
@@ skipping 147 matching lines @@
     if (proxy_config_dict) {
       // Warning: The DictionaryValue returned from
       // ReadDictionaryFromJson/JSONParser is an optimized derived class that
       // doesn't allow releasing ownership of nested values. A Swap in the wrong
       // order leads to memory access errors.
       proxy_config_.MergeDictionary(proxy_config_dict.get());
     } else {
       NET_LOG(ERROR) << "Failed to parse " << path() << "." << key;
     }
     return true;
+  } else if (key == shill::kProviderProperty) {
+    const base::DictionaryValue* dict;
+    std::string provider_type;
+    if (!value.GetAsDictionary(&dict) ||
+        !dict->GetStringWithoutPathExpansion(shill::kTypeProperty,
+                                             &provider_type)) {
+      return false;
+    }
+
+    if (provider_type != shill::kProviderThirdPartyVpn) {
+      // If the network uses the built-in OpenVPN and L2TP support, set the
+      // provider ID to an empty string.
+      vpn_provider_id_.clear();
+      return true;
+    }
+
+    // If the network uses a third-party VPN provider, set the provider ID to
+    // the third-party VPN provider's extension ID, which is held in the
+    // |shill::kHostProperty|.
+    return dict->GetStringWithoutPathExpansion(shill::kHostProperty,
+                                               &vpn_provider_id_);
   }
   return false;
 }
 
 bool NetworkState::InitialPropertiesReceived(
     const base::DictionaryValue& properties) {
   NET_LOG(EVENT) << "InitialPropertiesReceived: " << path() << ": " << name()
                  << " State: " << connection_state_ << " Visible: " << visible_;
   if (!properties.HasKey(shill::kTypeProperty)) {
     NET_LOG(ERROR) << "NetworkState has no type: "
@@ skipping 199 matching lines @@
   return IsCaptivePortalState(shill_properties, false /* log */);
 }
 
 // static
 bool NetworkState::ErrorIsValid(const std::string& error) {
   // Shill uses "Unknown" to indicate an unset or cleared error state.
   return !error.empty() && error != kErrorUnknown;
 }
 
 }  // namespace chromeos