Set onc_source UI data parameter when importing ONC.

chrome/browser/chromeos/cros/network_library.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_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/timer.h"
+#include "chrome/browser/chromeos/cros/network_ui_data.h"
 #include "third_party/cros/chromeos_network.h"
 
 namespace base {
 class DictionaryValue;
 class Value;
 }
 
 namespace chromeos {
 
 class NetworkDeviceParser;
@@ skipping 627 matching lines @@
   NetworkProfileType profile_type() const { return profile_type_; }
 
   const std::string& unique_id() const { return unique_id_; }
   int priority_order() const { return priority_order_; }
 
   const std::string& proxy_config() const { return proxy_config_; }
 
   const DictionaryValue* ui_data() const { return &ui_data_; }
   DictionaryValue* ui_data() { return &ui_data_; }
 
+  const DictionaryValue* onc() const { return &onc_; }
+  DictionaryValue* onc() { return &onc_; }
+
   void set_notify_failure(bool state) { notify_failure_ = state; }
 
   void SetPreferred(bool preferred);
 
   void SetAutoConnect(bool auto_connect);
 
   void SetName(const std::string& name);
 
   void SetSaveCredentials(bool save_credentials);
 
@@ skipping 162 matching lines @@
 
   // These must not be modified after construction.
   std::string service_path_;
   ConnectionType type_;
 
   // UI-level state that is opaque to the connection manager. It's kept in a
   // DictionaryValue to allow for simple addition of new settings. The value is
   // stored in JSON-serialized from in the connection manager.
   DictionaryValue ui_data_;
 
+  // This contains the ONC blob if this network was imported via ONC. This is

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

nit: This contains the deserialized ONC blob...

[Mattias Nissler (ping if slow), 2011/12/14 20:46:38]

Obsolete now...

+  // currently only used for policy-configured networks to figure out which
+  // properties should be user-editable and what their default values are.
+  DictionaryValue onc_;
+
   // This is the parser we use to parse messages from the native
   // network layer.
   scoped_ptr<NetworkParser> network_parser_;
 
   // This map stores the set of properties for the network.
   // Not all properties in this map are exposed via get methods.
   PropertyMap property_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Network);
 };
@@ skipping 923 matching lines @@
   // If nothing is changed, this method does nothing.
   virtual void SetIPConfig(const NetworkIPConfig& ipconfig) = 0;
 
   // This will connect to a preferred network if the currently connected
   // network is not preferred. This should be called when the active profile
   // changes.
   virtual void SwitchToPreferredNetwork() = 0;
 
   // Load networks from an Open Network Configuration blob.
   virtual bool LoadOncNetworks(const std::string& onc_blob,
-                               const std::string& passcode) = 0;
+                               const std::string& passcode,
+                               NetworkUIData::ONCSource source) = 0;
 
   // This sets the active network for the network type. Note: priority order
   // is unchanged (i.e. if a wifi network is set to active, but an ethernet
   // network is still active, active_network() will still return the ethernet
   // network). Other networks of the same type will become inactive.
   // Used for testing.
   virtual bool SetActiveNetwork(ConnectionType type,
                                 const std::string& service_path) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_