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

Unified Diff: chromeos/network/network_util.cc

Issue 1043343002: Use networkingPrivate.startConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430115_internet_options_cellular
Patch Set: Rebase Created 5 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_util.cc
diff --git a/chromeos/network/network_util.cc b/chromeos/network/network_util.cc
index b5d50b3219ec14904f9e0eb70fedf4e92e348ded..829aae3f61942f4d545b60de6e0aecac9462ecb8 100644
--- a/chromeos/network/network_util.cc
+++ b/chromeos/network/network_util.cc
@@ -210,6 +210,26 @@ scoped_ptr<base::ListValue> TranslateNetworkListToONC(
return network_properties_list.Pass();
}
+scoped_ptr<base::DictionaryValue> TranslateShillPropertiesToONC(
+ const std::string& service_path,
+ const base::DictionaryValue& shill_properties,
+ ::onc::ONCSource onc_source) {
+ scoped_ptr<base::DictionaryValue> shill_dictionary(
+ shill_properties.DeepCopy());
+ // Shill's 'Error' property is transient. Use NetworkState::GetErrorState()
+ // instead.
+ const NetworkState* network_state =
+ NetworkHandler::Get()->network_state_handler()->GetNetworkState(
+ service_path);
+ if (network_state) {
+ std::string error_state = network_state->GetErrorState();
pneubeck (no reviews) 2015/04/13 19:16:11 this deviates from the GetStateProperties behavior
stevenjb 2015/04/13 21:16:32 I was trying to avoid adding a dependency on NSH t
+ shill_dictionary->SetStringWithoutPathExpansion(shill::kErrorProperty,
+ error_state);
+ }
+ return TranslateShillServiceToONCPart(*shill_dictionary, onc_source,
+ &onc::kNetworkWithStateSignature);
+}
+
std::string TranslateONCTypeToShill(const std::string& onc_type) {
if (onc_type == ::onc::network_type::kEthernet)
return shill::kTypeEthernet;

Powered by Google App Engine
This is Rietveld 408576698