Chromium Code Reviews| Index: chromeos/network/network_ui_data.h |
| diff --git a/chromeos/network/network_ui_data.h b/chromeos/network/network_ui_data.h |
| index b65987e309b3227a964dd69f84d92067552020f4..d810d271812743d716770682dced66e18dd8bebc 100644 |
| --- a/chromeos/network/network_ui_data.h |
| +++ b/chromeos/network/network_ui_data.h |
| @@ -78,6 +78,21 @@ class CHROMEOS_EXPORT NetworkUIData { |
| // keys appropriate for Network::ui_data() as defined below (kKeyXXX). |
| void FillDictionary(base::DictionaryValue* dict) const; |
| + // Creates a NetworkUIData object from |onc_network|, which has to be a valid |
| + // ONC NetworkConfiguration dictionary. |
| + // This function is used to create the "UIData" field of the Shill |
| + // configuration. |
| + static scoped_ptr<NetworkUIData> CreateUIDataFromONC( |
| + onc::ONCSource onc_source, |
| + const base::DictionaryValue& onc_network); |
| + |
| + // Creates a NetworkUIData object from |properties| which contain a complete |
| + // dictionary for the Shill Service properties. This function retrieves and |
| + // parses the flimflam::kUIDataProperty and constructs NetworkUIData from it. |
| + // Returns a NULL scoped_ptr if unable to parse |properties|. |
| + static scoped_ptr<NetworkUIData> CreateUIDataFromShill( |
|
pneubeck (no reviews)
2013/05/07 08:46:39
I don't think that this should be placed here.
I w
stevenjb
2013/05/08 01:57:22
Hmm, I'm not entirely convinced that UIData should
|
| + const base::DictionaryValue& properties); |
| + |
| // Key for storing source of the ONC network. |
| static const char kKeyONCSource[]; |
| @@ -98,15 +113,6 @@ class CHROMEOS_EXPORT NetworkUIData { |
| std::string policy_guid_; |
| }; |
| -// Creates a NetworkUIData object from |onc_network|, which has to be a valid |
| -// ONC NetworkConfiguration dictionary. |
| -// |
| -// This function is used to create the "UIData" field of the Shill |
| -// configuration. |
| -CHROMEOS_EXPORT scoped_ptr<NetworkUIData> CreateUIDataFromONC( |
| - onc::ONCSource onc_source, |
| - const base::DictionaryValue& onc_network); |
| - |
| } // namespace chromeos |
| #endif // CHROMEOS_NETWORK_NETWORK_UI_DATA_H_ |