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

Unified Diff: chromeos/network/managed_network_configuration_handler_impl.cc

Issue 1043343002: Use networkingPrivate.startConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430115_internet_options_cellular
Patch Set: . 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/managed_network_configuration_handler_impl.cc
diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc
index a92be669fc77424d8ecba71f2cc903c385080fc7..f20cdcc356cfd0ac54185fc38422bc9da0837160 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.cc
+++ b/chromeos/network/managed_network_configuration_handler_impl.cc
@@ -164,9 +164,12 @@ void ManagedNetworkConfigurationHandlerImpl::SendManagedProperties(
::onc::ONCSource onc_source;
FindPolicyByGUID(userhash, guid, &onc_source);
+ const NetworkState* network_state =
+ network_state_handler_->GetNetworkState(service_path);
scoped_ptr<base::DictionaryValue> active_settings(
- onc::TranslateShillServiceToONCPart(
- *shill_properties, onc_source, &onc::kNetworkWithStateSignature));
+ onc::TranslateShillServiceToONCPart(*shill_properties, onc_source,
+ &onc::kNetworkWithStateSignature,
+ network_state));
const base::DictionaryValue* network_policy = NULL;
const base::DictionaryValue* global_policy = NULL;
@@ -213,10 +216,12 @@ void ManagedNetworkConfigurationHandlerImpl::SendProperties(
const network_handler::ErrorCallback& error_callback,
const std::string& service_path,
scoped_ptr<base::DictionaryValue> shill_properties) {
+ const NetworkState* network_state =
+ network_state_handler_->GetNetworkState(service_path);
scoped_ptr<base::DictionaryValue> onc_network(
onc::TranslateShillServiceToONCPart(
*shill_properties, ::onc::ONC_SOURCE_UNKNOWN,
- &onc::kNetworkWithStateSignature));
+ &onc::kNetworkWithStateSignature, network_state));
callback.Run(service_path, *onc_network);
}

Powered by Google App Engine
This is Rietveld 408576698