| 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 8ada86f35ce871ea9c857f0f00718c159f95b5b4..6f820f2b19dcac971764c76a8212e5e13023c52a 100644
|
| --- a/chromeos/network/managed_network_configuration_handler_impl.cc
|
| +++ b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| @@ -718,7 +718,8 @@ ManagedNetworkConfigurationHandlerImpl::GetGlobalConfigFromPolicy(
|
| const base::DictionaryValue*
|
| ManagedNetworkConfigurationHandlerImpl::FindPolicyByGuidAndProfile(
|
| const std::string& guid,
|
| - const std::string& profile_path) const {
|
| + const std::string& profile_path,
|
| + ::onc::ONCSource* onc_source) const {
|
| const NetworkProfile* profile =
|
| network_profile_handler_->GetProfileForPath(profile_path);
|
| if (!profile) {
|
| @@ -730,7 +731,13 @@ ManagedNetworkConfigurationHandlerImpl::FindPolicyByGuidAndProfile(
|
| if (!policies)
|
| return NULL;
|
|
|
| - return GetByGUID(policies->per_network_config, guid);
|
| + const base::DictionaryValue* policy =
|
| + GetByGUID(policies->per_network_config, guid);
|
| + if (policy && onc_source) {
|
| + *onc_source = (profile->userhash.empty() ? ::onc::ONC_SOURCE_DEVICE_POLICY
|
| + : ::onc::ONC_SOURCE_USER_POLICY);
|
| + }
|
| + return policy;
|
| }
|
|
|
| const ManagedNetworkConfigurationHandlerImpl::Policies*
|
|
|