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

Side by Side Diff: chromeos/network/policy_applicator.h

Issue 510123004: Apply global auto connect ONC policy in GetManagedProperties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nit. Created 6 years, 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CHROMEOS_NETWORK_POLICY_APPLICATOR_H_ 5 #ifndef CHROMEOS_NETWORK_POLICY_APPLICATOR_H_
6 #define CHROMEOS_NETWORK_POLICY_APPLICATOR_H_ 6 #define CHROMEOS_NETWORK_POLICY_APPLICATOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 // Sends Shill the command to delete profile entry |entry| from |profile_|. 74 // Sends Shill the command to delete profile entry |entry| from |profile_|.
75 void DeleteEntry(const std::string& entry); 75 void DeleteEntry(const std::string& entry);
76 76
77 // Sends the Shill configuration |shill_dictionary| to Shill. If |write_later| 77 // Sends the Shill configuration |shill_dictionary| to Shill. If |write_later|
78 // is true, the configuration is queued for sending until ~PolicyApplicator. 78 // is true, the configuration is queued for sending until ~PolicyApplicator.
79 void WriteNewShillConfiguration(const base::DictionaryValue& shill_dictionary, 79 void WriteNewShillConfiguration(const base::DictionaryValue& shill_dictionary,
80 const base::DictionaryValue& policy, 80 const base::DictionaryValue& policy,
81 bool write_later); 81 bool write_later);
82 82
83 // Adds properties to |properties_to_update|, which are enforced on an
84 // unamaged network by the global network config of the policy.
85 // |entry_properties| are the network's current properties read from its
86 // profile entry.
87 void GetPropertiesForUnmanagedEntry(
88 const base::DictionaryValue& entry_properties,
89 base::DictionaryValue* properties_to_update) const;
90
91 // Called once all Profile entries are processed. Calls 83 // Called once all Profile entries are processed. Calls
92 // ApplyRemainingPolicies. 84 // ApplyRemainingPolicies.
93 virtual ~PolicyApplicator(); 85 virtual ~PolicyApplicator();
94 86
95 // Creates new entries for all remaining policies, i.e. for which no matching 87 // Creates new entries for all remaining policies, i.e. for which no matching
96 // Profile entry was found. 88 // Profile entry was found.
97 void ApplyRemainingPolicies(); 89 void ApplyRemainingPolicies();
98 90
99 std::set<std::string> remaining_policies_; 91 std::set<std::string> remaining_policies_;
100 base::WeakPtr<ConfigurationHandler> handler_; 92 base::WeakPtr<ConfigurationHandler> handler_;
101 NetworkProfile profile_; 93 NetworkProfile profile_;
102 GuidToPolicyMap all_policies_; 94 GuidToPolicyMap all_policies_;
103 base::DictionaryValue global_network_config_; 95 base::DictionaryValue global_network_config_;
104 ScopedVector<base::DictionaryValue> new_shill_configurations_; 96 ScopedVector<base::DictionaryValue> new_shill_configurations_;
105 97
106 DISALLOW_COPY_AND_ASSIGN(PolicyApplicator); 98 DISALLOW_COPY_AND_ASSIGN(PolicyApplicator);
107 }; 99 };
108 100
109 } // namespace chromeos 101 } // namespace chromeos
110 102
111 #endif // CHROMEOS_NETWORK_POLICY_APPLICATOR_H_ 103 #endif // CHROMEOS_NETWORK_POLICY_APPLICATOR_H_
OLDNEW
« no previous file with comments | « chromeos/network/managed_network_configuration_handler_unittest.cc ('k') | chromeos/network/policy_applicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698