Set onc_source UI data parameter when importing ONC.

chrome/browser/chromeos/cros/network_ui_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_UI_DATA_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_UI_DATA_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/network_parser.h"
+#include "chrome/browser/chromeos/cros/enum_mapper.h"
 
 namespace chromeos {
 
 class Network;
 class NetworkPropertyUIData;
 
 // Helper for accessing and setting values in the network's UI data dictionary.
 // Accessing values is done via static members that take the network as an
 // argument. In order to fill a UI data dictionary, construct an instance, set
 // up your data members, and call FillDictionary(). For example, if you have a
 // |network|:
 //
 //      NetworkUIData ui_data;
 //      ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_IMPORT);
-//      NetworkPropertyUIData auto_connect_property(
-//              NetworkPropertyUIData::CONTROLLER_USER,
-//              base::Value::CreateBooleanValue(true));
-//      ui_data.SetProperty(NetworkUIData::kPropertyAutoConnect,
-//                          auto_connect_property);
 //      ui_data.FillDictionary(network->ui_data());
 class NetworkUIData {
  public:
   // Indicates from which source an ONC blob comes from.
   enum ONCSource {
     ONC_SOURCE_NONE,
     ONC_SOURCE_USER_IMPORT,
     ONC_SOURCE_DEVICE_POLICY,
     ONC_SOURCE_USER_POLICY,
   };
@@ skipping 44 matching lines @@
   static const char kPropertyEAPClientCertPkcs11Id[];
   static const char kPropertyEAPUseSystemCAs[];
   static const char kPropertyEAPIdentity[];
   static const char kPropertyEAPAnonymousIdentity[];
   static const char kPropertyEAPPassphrase[];
 
  private:
   static EnumMapper<ONCSource>& GetONCSourceMapper();
 
   ONCSource onc_source_;
   DictionaryValue properties_;

[kmixter1, 2011/12/13 01:44:07]

I'm still not clear on what properties_ will contain here on out.  Is your plan
to do a compilation step over all properties from ONC and store in here that
they come from policy instead of looking up by consulting the onc_ field in the
network?

[Mattias Nissler (ping if slow), 2011/12/13 13:52:19]

Note that this gets removed in the other CL. This one is just about the
ONCNetworkParser side. I've now remove the changes from this file, since they
belong to the other CL.

[kmixter1, 2011/12/13 19:21:03]

OK - makes sense now that I've reviewed the other CL.

 
   static const EnumMapper<NetworkUIData::ONCSource>::Pair kONCSourceTable[];
 
   DISALLOW_COPY_AND_ASSIGN(NetworkUIData);
 };
 
 // Holds meta information for a network property: Whether the property is under
 // policy control, if it is user-editable, and whether the policy-provided
 // default value, if applicable.
 class NetworkPropertyUIData {
@@ skipping 47 matching lines @@
 
   // So it can access the kKeyXYZ constants.
   friend class NetworkUIDataTest;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkPropertyUIData);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_UI_DATA_H_