diff options
Diffstat (limited to 'chrome/browser/chromeos/net/onc_utils.cc')
| -rw-r--r-- | chrome/browser/chromeos/net/onc_utils.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc index 3c067f4..abcd08a 100644 --- a/chrome/browser/chromeos/net/onc_utils.cc +++ b/chrome/browser/chromeos/net/onc_utils.cc @@ -217,6 +217,8 @@ void ImportNetworksForUser(const user_manager::User* user, normalizer.NormalizeObject(&onc::kNetworkConfigurationSignature, *network); + // TODO(pneubeck): Use ONC and ManagedNetworkConfigurationHandler instead. + // crbug.com/457936 scoped_ptr<base::DictionaryValue> shill_dict = onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature, *normalized_network); @@ -243,7 +245,7 @@ void ImportNetworksForUser(const user_manager::User* user, NetworkHandler::Get()->network_state_handler()->FirstNetworkByType( NetworkTypePattern::Ethernet()); if (ethernet) { - config_handler->SetProperties( + config_handler->SetShillProperties( ethernet->path(), *shill_dict, NetworkConfigurationObserver::SOURCE_USER_ACTION, base::Closure(), network_handler::ErrorCallback()); @@ -252,9 +254,8 @@ void ImportNetworksForUser(const user_manager::User* user, } } else { - config_handler->CreateConfiguration( - *shill_dict, - NetworkConfigurationObserver::SOURCE_USER_ACTION, + config_handler->CreateShillConfiguration( + *shill_dict, NetworkConfigurationObserver::SOURCE_USER_ACTION, network_handler::StringResultCallback(), network_handler::ErrorCallback()); } |