OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/policy/network_configuration_updater.h" | 5 #include "chrome/browser/policy/network_configuration_updater.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
11 #include "chrome/browser/chromeos/cros/network_library.h" | 11 #include "chrome/browser/chromeos/cros/network_library.h" |
12 #include "chrome/browser/policy/policy_map.h" | 12 #include "chrome/browser/policy/policy_map.h" |
| 13 #include "chrome/browser/policy/policy_namespace.h" |
13 #include "chromeos/network/onc/onc_constants.h" | 14 #include "chromeos/network/onc/onc_constants.h" |
14 #include "chromeos/network/onc/onc_utils.h" | 15 #include "chromeos/network/onc/onc_utils.h" |
15 #include "policy/policy_constants.h" | 16 #include "policy/policy_constants.h" |
16 | 17 |
17 namespace policy { | 18 namespace policy { |
18 | 19 |
19 NetworkConfigurationUpdater::NetworkConfigurationUpdater( | 20 NetworkConfigurationUpdater::NetworkConfigurationUpdater( |
20 PolicyService* policy_service, | 21 PolicyService* policy_service, |
21 chromeos::NetworkLibrary* network_library) | 22 chromeos::NetworkLibrary* network_library) |
22 : policy_change_registrar_( | 23 : policy_change_registrar_( |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 if (new_network_config.empty()) | 102 if (new_network_config.empty()) |
102 new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration; | 103 new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration; |
103 | 104 |
104 if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source, | 105 if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source, |
105 allow_web_trust_)) { | 106 allow_web_trust_)) { |
106 LOG(ERROR) << "Errors occurred during the ONC policy application."; | 107 LOG(ERROR) << "Errors occurred during the ONC policy application."; |
107 } | 108 } |
108 } | 109 } |
109 | 110 |
110 } // namespace policy | 111 } // namespace policy |
OLD | NEW |