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

Unified Diff: chrome/browser/policy/policy_loader_win.h

Issue 22645011: policy: use JSON schema to deserialize entries from Windows registry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 3rd party policy unit tests Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/policy_domain_descriptor.cc ('k') | chrome/browser/policy/policy_loader_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_loader_win.h
diff --git a/chrome/browser/policy/policy_loader_win.h b/chrome/browser/policy/policy_loader_win.h
index 3b6f13a5e2c99ebbd0a7bcb95974bc8df1b68455..f662cf20e598fd58fb750515647e759a43f40ed4 100644
--- a/chrome/browser/policy/policy_loader_win.h
+++ b/chrome/browser/policy/policy_loader_win.h
@@ -17,6 +17,7 @@
#include "base/win/object_watcher.h"
#include "chrome/browser/policy/async_policy_loader.h"
#include "chrome/browser/policy/policy_types.h"
+#include "components/policy/core/common/policy_schema.h"
namespace base {
class SequencedTaskRunner;
@@ -66,9 +67,6 @@ class PolicyLoaderWin : public AsyncPolicyLoader,
virtual scoped_ptr<PolicyBundle> Load() OVERRIDE;
private:
- // Builds the Chrome policy schema in |chrome_policy_schema_|.
- void BuildChromePolicySchema();
-
// Reads Chrome Policy from a PReg file at the given path and stores the
// result in |policy|.
bool ReadPRegFile(const base::FilePath& preg_file,
@@ -98,6 +96,12 @@ class PolicyLoaderWin : public AsyncPolicyLoader,
PolicyScope scope,
PolicyMap* chrome_policy_map);
+ // Loads 3rd-party policy schema.
+ const PolicySchema* Load3rdPartyPolicySchema(
+ PolicyDomain domain,
+ const std::string& component_key,
+ RegistryDict* component_dict);
+
// Loads 3rd-party policy from |gpo_dict| and merges it into |bundle|.
void Load3rdPartyPolicy(const RegistryDict* gpo_dict,
PolicyScope scope,
@@ -113,7 +117,6 @@ class PolicyLoaderWin : public AsyncPolicyLoader,
const PolicyDefinitionList* policy_list_;
const string16 chrome_policy_key_;
class AppliedGPOListProvider* gpo_provider_;
- base::DictionaryValue chrome_policy_schema_;
base::WaitableEvent user_policy_changed_event_;
base::WaitableEvent machine_policy_changed_event_;
« no previous file with comments | « chrome/browser/policy/policy_domain_descriptor.cc ('k') | chrome/browser/policy/policy_loader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698