Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "chrome/browser/policy/policy_service.h" | 13 #include "chrome/browser/policy/policy_service.h" |
| 14 #include "components/onc/onc_constants.h" | 14 #include "components/onc/onc_constants.h" |
| 15 | 15 |
| 16 namespace base { | 16 namespace base { |
| 17 class Value; | 17 class Value; |
|
bartfab (slow)
2013/10/16 12:40:31
Nit: Forward-declare ListValue and DictionaryValue
pneubeck (no reviews)
2013/10/17 10:22:26
Done.
| |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace chromeos { | 20 namespace chromeos { |
| 21 class ManagedNetworkConfigurationHandler; | 21 class ManagedNetworkConfigurationHandler; |
| 22 | 22 |
| 23 namespace onc { | 23 namespace onc { |
| 24 class CertificateImporter; | 24 class CertificateImporter; |
| 25 } | 25 } |
| 26 } | 26 } |
| 27 | 27 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 chromeos::ManagedNetworkConfigurationHandler* network_config_handler); | 62 chromeos::ManagedNetworkConfigurationHandler* network_config_handler); |
| 63 | 63 |
| 64 void Init(); | 64 void Init(); |
| 65 | 65 |
| 66 // Imports the certificates part of the policy. | 66 // Imports the certificates part of the policy. |
| 67 virtual void ImportCertificates(const base::ListValue& certificates_onc); | 67 virtual void ImportCertificates(const base::ListValue& certificates_onc); |
| 68 | 68 |
| 69 // Pushes the network part of the policy to the | 69 // Pushes the network part of the policy to the |
| 70 // ManagedNetworkConfigurationHandler. This can be overridden by subclasses to | 70 // ManagedNetworkConfigurationHandler. This can be overridden by subclasses to |
| 71 // modify |network_configs_onc| before the actual application. | 71 // modify |network_configs_onc| before the actual application. |
| 72 virtual void ApplyNetworkPolicy(base::ListValue* network_configs_onc); | 72 virtual void ApplyNetworkPolicy(base::ListValue* network_configs_onc, |
| 73 base::DictionaryValue* global_network_config); | |
| 73 | 74 |
| 74 onc::ONCSource onc_source_; | 75 onc::ONCSource onc_source_; |
| 75 | 76 |
| 76 // Pointer to the global singleton or a test instance. | 77 // Pointer to the global singleton or a test instance. |
| 77 chromeos::ManagedNetworkConfigurationHandler* network_config_handler_; | 78 chromeos::ManagedNetworkConfigurationHandler* network_config_handler_; |
| 78 | 79 |
| 79 scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer_; | 80 scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer_; |
| 80 | 81 |
| 81 private: | 82 private: |
| 82 // Called if the ONC policy changed. | 83 // Called if the ONC policy changed. |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 94 | 95 |
| 95 // Used to retrieve the policies. | 96 // Used to retrieve the policies. |
| 96 PolicyService* policy_service_; | 97 PolicyService* policy_service_; |
| 97 | 98 |
| 98 DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdater); | 99 DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdater); |
| 99 }; | 100 }; |
| 100 | 101 |
| 101 } // namespace policy | 102 } // namespace policy |
| 102 | 103 |
| 103 #endif // CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_ | 104 #endif // CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_ |
| OLD | NEW |