diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 15:23:22 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 15:23:22 +0000 |
| commit | 79c9e95c352e3b29d31ef83e45cd930bb4c2ff57 (patch) | |
| tree | 7ca423b3975d050a76b69cad2ac189ae9ffef47c /chrome_frame/chrome_launcher.cc | |
| parent | 271068e43aee1971f1d2169900d9c93bc6ad84a2 (diff) | |
| download | chromium_src-79c9e95c352e3b29d31ef83e45cd930bb4c2ff57.zip chromium_src-79c9e95c352e3b29d31ef83e45cd930bb4c2ff57.tar.gz chromium_src-79c9e95c352e3b29d31ef83e45cd930bb4c2ff57.tar.bz2 | |
Change PolicyLoaderWin to load PReg files if possible.
We now query whether GPO is present and read directly from the corresponding
PReg files. The registry is used only as a fallback source for policy values.
To accomplish this, PolicyLoaderWin now works in two steps: It first converts
the GPO input into base::Value representation and then maps that to proper
policy values. This also unifies the handling for Chrome policy and 3rd-party
policy.
BUG=chromium:186445
TEST=unit tests
TBR=grt@chromium.org, cpu@chromium.org, ben@chromium.org
Review URL: https://codereview.chromium.org/13619014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_launcher.cc')
| -rw-r--r-- | chrome_frame/chrome_launcher.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc index 88fc0da..28613f4 100644 --- a/chrome_frame/chrome_launcher.cc +++ b/chrome_frame/chrome_launcher.cc @@ -164,7 +164,7 @@ void AppendAdditionalLaunchParameters(std::wstring* command_line) { LONG result; bool found = false; for (int i = 0; !found && i < arraysize(kRootKeys); ++i) { - result = ::RegOpenKeyExW(kRootKeys[i], policy::kRegistryMandatorySubKey, 0, + result = ::RegOpenKeyExW(kRootKeys[i], policy::kRegistryChromePolicyKey, 0, KEY_QUERY_VALUE, &key); if (result == ERROR_SUCCESS) { DWORD size = 0; |