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/chromeos/policy/network_configuration_updater.h" | 5 #include "chrome/browser/chromeos/policy/network_configuration_updater.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
11 #include "chrome/browser/policy/policy_map.h" | |
12 #include "chromeos/network/managed_network_configuration_handler.h" | 11 #include "chromeos/network/managed_network_configuration_handler.h" |
13 #include "chromeos/network/onc/onc_certificate_importer.h" | 12 #include "chromeos/network/onc/onc_certificate_importer.h" |
14 #include "chromeos/network/onc/onc_utils.h" | 13 #include "chromeos/network/onc/onc_utils.h" |
| 14 #include "components/policy/core/common/policy_map.h" |
15 #include "policy/policy_constants.h" | 15 #include "policy/policy_constants.h" |
16 | 16 |
17 namespace policy { | 17 namespace policy { |
18 | 18 |
19 NetworkConfigurationUpdater::~NetworkConfigurationUpdater() { | 19 NetworkConfigurationUpdater::~NetworkConfigurationUpdater() { |
20 policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, this); | 20 policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, this); |
21 } | 21 } |
22 | 22 |
23 // static | 23 // static |
24 scoped_ptr<NetworkConfigurationUpdater> | 24 scoped_ptr<NetworkConfigurationUpdater> |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 | 129 |
130 ImportCertificates(certificates); | 130 ImportCertificates(certificates); |
131 ApplyNetworkPolicy(&network_configs, &global_network_config); | 131 ApplyNetworkPolicy(&network_configs, &global_network_config); |
132 } | 132 } |
133 | 133 |
134 std::string NetworkConfigurationUpdater::LogHeader() const { | 134 std::string NetworkConfigurationUpdater::LogHeader() const { |
135 return chromeos::onc::GetSourceAsString(onc_source_); | 135 return chromeos::onc::GetSourceAsString(onc_source_); |
136 } | 136 } |
137 | 137 |
138 } // namespace policy | 138 } // namespace policy |
OLD | NEW |