diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 09:23:26 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 09:23:26 +0000 |
| commit | 0d9fb0e71d76e11b3af0482b72a5bdd5011b01d2 (patch) | |
| tree | d09b3625aba9deba943e30f0fc80627502dae727 /chromeos/network/network_configuration_handler.cc | |
| parent | 11c1b7c1e8f2c69b613681e0223be4bb3a8909c3 (diff) | |
| download | chromium_src-0d9fb0e71d76e11b3af0482b72a5bdd5011b01d2.zip chromium_src-0d9fb0e71d76e11b3af0482b72a5bdd5011b01d2.tar.gz chromium_src-0d9fb0e71d76e11b3af0482b72a5bdd5011b01d2.tar.bz2 | |
Replace additional network properties with ONC values
BUG=279351
Review URL: https://codereview.chromium.org/364883002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_configuration_handler.cc')
| -rw-r--r-- | chromeos/network/network_configuration_handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc index 79ad45d..c0f653e 100644 --- a/chromeos/network/network_configuration_handler.cc +++ b/chromeos/network/network_configuration_handler.cc @@ -21,6 +21,7 @@ #include "chromeos/dbus/shill_profile_client.h" #include "chromeos/dbus/shill_service_client.h" #include "chromeos/network/network_event_log.h" +#include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/network/shill_property_util.h" #include "dbus/object_path.h" @@ -303,11 +304,12 @@ void NetworkConfigurationHandler::RemoveConfiguration( const network_handler::ErrorCallback& error_callback) { // Service.Remove is not reliable. Instead, request the profile entries // for the service and remove each entry. - if (ContainsKey(profile_entry_deleters_,service_path)) { + if (ContainsKey(profile_entry_deleters_, service_path)) { InvokeErrorCallback( service_path, error_callback, "RemoveConfigurationInProgress"); return; } + NET_LOG_USER("Remove Configuration", service_path); ProfileEntryDeleter* deleter = new ProfileEntryDeleter(this, service_path, callback, error_callback); |