Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1115)

Side by Side Diff: chrome/browser/chromeos/policy/network_configuration_updater.h

Issue 23526016: Autoconnect policy for CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed policy. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 DictionaryValue;
18 class ListValue;
17 class Value; 19 class Value;
18 } 20 }
19 21
20 namespace chromeos { 22 namespace chromeos {
21 class ManagedNetworkConfigurationHandler; 23 class ManagedNetworkConfigurationHandler;
22 24
23 namespace onc { 25 namespace onc {
24 class CertificateImporter; 26 class CertificateImporter;
25 } 27 }
26 } 28 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 chromeos::ManagedNetworkConfigurationHandler* network_config_handler); 64 chromeos::ManagedNetworkConfigurationHandler* network_config_handler);
63 65
64 void Init(); 66 void Init();
65 67
66 // Imports the certificates part of the policy. 68 // Imports the certificates part of the policy.
67 virtual void ImportCertificates(const base::ListValue& certificates_onc); 69 virtual void ImportCertificates(const base::ListValue& certificates_onc);
68 70
69 // Pushes the network part of the policy to the 71 // Pushes the network part of the policy to the
70 // ManagedNetworkConfigurationHandler. This can be overridden by subclasses to 72 // ManagedNetworkConfigurationHandler. This can be overridden by subclasses to
71 // modify |network_configs_onc| before the actual application. 73 // modify |network_configs_onc| before the actual application.
72 virtual void ApplyNetworkPolicy(base::ListValue* network_configs_onc); 74 virtual void ApplyNetworkPolicy(base::ListValue* network_configs_onc,
75 base::DictionaryValue* global_network_config);
73 76
74 onc::ONCSource onc_source_; 77 onc::ONCSource onc_source_;
75 78
76 // Pointer to the global singleton or a test instance. 79 // Pointer to the global singleton or a test instance.
77 chromeos::ManagedNetworkConfigurationHandler* network_config_handler_; 80 chromeos::ManagedNetworkConfigurationHandler* network_config_handler_;
78 81
79 scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer_; 82 scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer_;
80 83
81 private: 84 private:
82 // Called if the ONC policy changed. 85 // Called if the ONC policy changed.
(...skipping 11 matching lines...) Expand all
94 97
95 // Used to retrieve the policies. 98 // Used to retrieve the policies.
96 PolicyService* policy_service_; 99 PolicyService* policy_service_;
97 100
98 DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdater); 101 DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationUpdater);
99 }; 102 };
100 103
101 } // namespace policy 104 } // namespace policy
102 105
103 #endif // CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_ 106 #endif // CHROME_BROWSER_CHROMEOS_POLICY_NETWORK_CONFIGURATION_UPDATER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698