Proper management for policy-configured networks.

chrome/browser/chromeos/cros/onc_network_parser.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/cros/onc_network_parser.h"
 
 #include "base/base64.h"
 #include "base/json/json_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/stringprintf.h"
@@ skipping 467 matching lines @@
   if (!value.IsType(base::Value::TYPE_DICTIONARY)) {
     VLOG(1) << network->name() << ": expected object of type " << onc_type;
     return false;
   }
   VLOG(2) << "Parsing nested object of type " << onc_type;
   const DictionaryValue* dict = NULL;
   value.GetAsDictionary(&dict);
   for (DictionaryValue::key_iterator iter = dict->begin_keys();
        iter != dict->end_keys(); ++iter) {
     const std::string& key = *iter;
-    if (key == "Recommended")
-      continue;
-
     base::Value* inner_value = NULL;
     dict->GetWithoutPathExpansion(key, &inner_value);
     int field_index;
     for (field_index = 0; signature[field_index].field != NULL; ++field_index) {
       if (key == signature[field_index].field)
         break;
     }
     if (signature[field_index].field == NULL) {
       VLOG(1) << network->name() << ": unexpected field: "
               << key << ", in type: " << onc_type;
@@ skipping 150 matching lines @@
   // Do a pass over |signature|, filling in UI data where applicable.
   NetworkUIData ui_data;
   for (int i = 0; signature[i].field != NULL; ++i) {
     if (!signature[i].ui_data_key)
       continue;
 
     bool controlled_by_policy =
         (onc_source_ == NetworkUIData::ONC_SOURCE_DEVICE_POLICY ||
          onc_source_ == NetworkUIData::ONC_SOURCE_USER_POLICY) &&
         !all_recommended &&
-        recommended.find(signature[i].field) == recommended.end();
+        recommended.find(signature[i].ui_data_key) == recommended.end();
     const Value* default_value = NULL;
     network->GetProperty(signature[i].index, &default_value);
     NetworkPropertyUIData property_ui_data(
         controlled_by_policy ? NetworkPropertyUIData::CONTROLLER_POLICY :
                                NetworkPropertyUIData::CONTROLLER_USER,
         default_value ? default_value->DeepCopy() : NULL);
     ui_data.SetProperty(signature[i].ui_data_key, property_ui_data);
   }
 
   // Merge the result into the network-level |ui_data| dictionary.
@@ skipping 448 matching lines @@
     // on the value of AuthenticationType.
     { "L2TP-IPsec", PROVIDER_TYPE_L2TP_IPSEC_PSK },
     { "OpenVPN", PROVIDER_TYPE_OPEN_VPN },
   };
   CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,
       (table, arraysize(table), PROVIDER_TYPE_MAX));
   return parser.Get(type);
 }
 
 }  // namespace chromeos