Chromium Code Reviews| Index: chrome/browser/policy/network_configuration_updater.cc |
| diff --git a/chrome/browser/policy/network_configuration_updater.cc b/chrome/browser/policy/network_configuration_updater.cc |
| index 788a0104dbfd9f5643ab5861ea2fd2d3e5979e26..fcefc3f67dc5ad16d472568072c3f53d8bc67b9b 100644 |
| --- a/chrome/browser/policy/network_configuration_updater.cc |
| +++ b/chrome/browser/policy/network_configuration_updater.cc |
| @@ -36,14 +36,17 @@ void NetworkConfigurationUpdater::Update() { |
| } |
| ApplyNetworkConfiguration(policy, kPolicyDeviceOpenNetworkConfiguration, |
| + chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY, |
|
kmixter1
2011/12/13 19:21:03
Could you add a TODO(crosbug.com/24152) to note th
Mattias Nissler (ping if slow)
2011/12/14 20:46:38
http://codereview.chromium.org/8804021/ does that.
|
| &device_network_config_); |
| ApplyNetworkConfiguration(policy, kPolicyOpenNetworkConfiguration, |
| + chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY, |
| &user_network_config_); |
| } |
| void NetworkConfigurationUpdater::ApplyNetworkConfiguration( |
| const PolicyMap& policy_map, |
| ConfigurationPolicyType policy_type, |
| + chromeos::NetworkUIData::ONCSource onc_source, |
| std::string* cached_value) { |
| std::string new_network_config; |
| const base::Value* value = policy_map.Get(policy_type); |
| @@ -56,7 +59,7 @@ void NetworkConfigurationUpdater::ApplyNetworkConfiguration( |
| if (*cached_value != new_network_config) { |
| *cached_value = new_network_config; |
| - if (!network_library_->LoadOncNetworks(new_network_config, "")) |
| + if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source)) |
| LOG(WARNING) << "Network library failed to load ONC configuration."; |
| } |
| } |