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,

[kmixter1, 2011/12/06 12:52:37]

Oh nice - so you will know which came from manual imports.

     ONC_SOURCE_DEVICE_POLICY,
     ONC_SOURCE_USER_POLICY,
   };
 
   // Constructs a new dictionary builder.
   NetworkUIData();
   ~NetworkUIData();
 
   // Sets the ONC source.
   void set_onc_source(ONCSource onc_source) { onc_source_ = onc_source; }
@@ skipping 17 matching lines @@
 
   // Per-property meta data. This is handled by NetworkPropertyUIData.
   static const char kKeyProperties[];
 
   // Property names for per-property dat
   static const char kPropertyAutoConnect[];
   static const char kPropertyPreferred[];
   static const char kPropertyPassphrase[];
   static const char kPropertySaveCredentials[];
 
   static const char kPropertyVPNCaCertNss[];

[kmixter1, 2011/12/06 12:52:37]

why do we have to have copies of all the property names here?

[Mattias Nissler (ping if slow), 2011/12/06 13:37:59]

Because I didn't want to leak ONC structural details into the internal data
representation, which at the moment still is PropertyIndex to value mappings. I
could use PropertyIndex values directly, but saving values directly will cause
trouble if the enum definition changes. Since I didn't want to use flimflam
property names either, I introduced new strings.

If/Once we switch to use ONC for the internal network config interchange format,
I'll happily change this to work on top of ONC directly. However, if we end up
doing so, this code will be most probably obsoleted anyway.

   static const char kPropertyVPNPskPassphrase[];
   static const char kPropertyVPNClientCertId[];
   static const char kPropertyVPNUsername[];
   static const char kPropertyVPNUserPassphrase[];
   static const char kPropertyVPNGroupName[];
 
   static const char kPropertyEAPMethod[];
   static const char kPropertyEAPPhase2Auth[];
   static const char kPropertyEAPServerCaCertNssNickname[];
   static const char kPropertyEAPClientCertPkcs11Id[];
@@ skipping 67 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_