| 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 bf7e191273f2633d863269706792d2116e3cb114..e4bbf77f27cf4b32a0f26ca04883dfc849e15374 100644
|
| --- a/chromeos/network/managed_network_configuration_handler_impl.cc
|
| +++ b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| @@ -19,6 +19,7 @@
|
| #include "chromeos/dbus/shill_profile_client.h"
|
| #include "chromeos/dbus/shill_service_client.h"
|
| #include "chromeos/network/device_state.h"
|
| +#include "chromeos/network/favorite_state.h"
|
| #include "chromeos/network/network_configuration_handler.h"
|
| #include "chromeos/network/network_event_log.h"
|
| #include "chromeos/network/network_policy_observer.h"
|
| @@ -50,7 +51,7 @@ const char kPoliciesNotInitialized[] = "PoliciesNotInitialized";
|
| const char kProfileNotInitialized[] = "ProflieNotInitialized";
|
| const char kSetOnUnconfiguredNetwork[] = "SetCalledOnUnconfiguredNetwork";
|
| const char kUnknownProfilePath[] = "UnknownProfilePath";
|
| -const char kUnknownServicePath[] = "UnknownServicePath";
|
| +const char kUnknownNetwork[] = "UnknownNetwork";
|
|
|
| std::string ToDebugString(::onc::ONCSource source,
|
| const std::string& userhash) {
|
| @@ -237,11 +238,11 @@ void ManagedNetworkConfigurationHandlerImpl::SetProperties(
|
| const base::DictionaryValue& user_settings,
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback) const {
|
| - const NetworkState* state =
|
| - network_state_handler_->GetNetworkState(service_path);
|
| -
|
| + const FavoriteState* state =
|
| + network_state_handler_->GetFavoriteStateFromServicePath(
|
| + service_path, true /* configured_only */);
|
| if (!state) {
|
| - InvokeErrorCallback(service_path, error_callback, kUnknownServicePath);
|
| + InvokeErrorCallback(service_path, error_callback, kUnknownNetwork);
|
| return;
|
| }
|
|
|
|
|