Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: chromeos/network/network_ui_data.h

Issue 14566009: Add NetworkConnectionHandler class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modify Shill stubs Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_

Powered by Google App Engine
This is Rietveld 408576698