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

Side by Side Diff: components/policy/core/common/config_dir_policy_loader.cc

Issue 1350913006: Revert of Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 (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 "components/policy/core/common/config_dir_policy_loader.h" 5 #include "components/policy/core/common/config_dir_policy_loader.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/files/file_enumerator.h" 13 #include "base/files/file_enumerator.h"
14 #include "base/files/file_util.h" 14 #include "base/files/file_util.h"
15 #include "base/json/json_file_value_serializer.h" 15 #include "base/json/json_file_value_serializer.h"
16 #include "base/json/json_reader.h" 16 #include "base/json/json_reader.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/stl_util.h" 18 #include "base/stl_util.h"
19 #include "components/policy/core/common/policy_bundle.h" 19 #include "components/policy/core/common/policy_bundle.h"
20 #include "components/policy/core/common/policy_load_status.h" 20 #include "components/policy/core/common/policy_load_status.h"
21 #include "components/policy/core/common/policy_types.h"
22 21
23 namespace policy { 22 namespace policy {
24 23
25 namespace { 24 namespace {
26 25
27 // Subdirectories that contain the mandatory and recommended policies. 26 // Subdirectories that contain the mandatory and recommended policies.
28 const base::FilePath::CharType kMandatoryConfigDir[] = 27 const base::FilePath::CharType kMandatoryConfigDir[] =
29 FILE_PATH_LITERAL("managed"); 28 FILE_PATH_LITERAL("managed");
30 const base::FilePath::CharType kRecommendedConfigDir[] = 29 const base::FilePath::CharType kRecommendedConfigDir[] =
31 FILE_PATH_LITERAL("recommended"); 30 FILE_PATH_LITERAL("recommended");
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 continue; 158 continue;
160 } 159 }
161 160
162 // Detach the "3rdparty" node. 161 // Detach the "3rdparty" node.
163 scoped_ptr<base::Value> third_party; 162 scoped_ptr<base::Value> third_party;
164 if (dictionary_value->Remove("3rdparty", &third_party)) 163 if (dictionary_value->Remove("3rdparty", &third_party))
165 Merge3rdPartyPolicy(third_party.get(), level, bundle); 164 Merge3rdPartyPolicy(third_party.get(), level, bundle);
166 165
167 // Add chrome policy. 166 // Add chrome policy.
168 PolicyMap policy_map; 167 PolicyMap policy_map;
169 policy_map.LoadFrom(dictionary_value, level, scope_, 168 policy_map.LoadFrom(dictionary_value, level, scope_);
170 POLICY_SOURCE_PLATFORM);
171 bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) 169 bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
172 .MergeFrom(policy_map); 170 .MergeFrom(policy_map);
173 } 171 }
174 } 172 }
175 173
176 void ConfigDirPolicyLoader::Merge3rdPartyPolicy( 174 void ConfigDirPolicyLoader::Merge3rdPartyPolicy(
177 const base::Value* policies, 175 const base::Value* policies,
178 PolicyLevel level, 176 PolicyLevel level,
179 PolicyBundle* bundle) { 177 PolicyBundle* bundle) {
180 // The first-level entries in |policies| are PolicyDomains. The second-level 178 // The first-level entries in |policies| are PolicyDomains. The second-level
(...skipping 29 matching lines...) Expand all
210 for (base::DictionaryValue::Iterator components_it(*components_dictionary); 208 for (base::DictionaryValue::Iterator components_it(*components_dictionary);
211 !components_it.IsAtEnd(); components_it.Advance()) { 209 !components_it.IsAtEnd(); components_it.Advance()) {
212 const base::DictionaryValue* policy_dictionary; 210 const base::DictionaryValue* policy_dictionary;
213 if (!components_it.value().GetAsDictionary(&policy_dictionary)) { 211 if (!components_it.value().GetAsDictionary(&policy_dictionary)) {
214 LOG(WARNING) << "3rdparty/" << domains_it.key() << "/" 212 LOG(WARNING) << "3rdparty/" << domains_it.key() << "/"
215 << components_it.key() << " value is not a dictionary!"; 213 << components_it.key() << " value is not a dictionary!";
216 continue; 214 continue;
217 } 215 }
218 216
219 PolicyMap policy; 217 PolicyMap policy;
220 policy.LoadFrom(policy_dictionary, level, scope_, POLICY_SOURCE_PLATFORM); 218 policy.LoadFrom(policy_dictionary, level, scope_);
221 bundle->Get(PolicyNamespace(domain, components_it.key())) 219 bundle->Get(PolicyNamespace(domain, components_it.key()))
222 .MergeFrom(policy); 220 .MergeFrom(policy);
223 } 221 }
224 } 222 }
225 } 223 }
226 224
227 void ConfigDirPolicyLoader::OnFileUpdated(const base::FilePath& path, 225 void ConfigDirPolicyLoader::OnFileUpdated(const base::FilePath& path,
228 bool error) { 226 bool error) {
229 if (!error) 227 if (!error)
230 Reload(false); 228 Reload(false);
231 } 229 }
232 230
233 } // namespace policy 231 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698