diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 23:02:21 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 23:02:21 +0000 |
| commit | 115d7acb7eb6da7cc8db153e42c2606a6c38d661 (patch) | |
| tree | 158975d47c02ea0801275f3830a12ed850b0da8b /chrome_frame/chrome_launcher.cc | |
| parent | f0696760a9e7859c9a4b1657638a15282af93004 (diff) | |
| download | chromium_src-115d7acb7eb6da7cc8db153e42c2606a6c38d661.zip chromium_src-115d7acb7eb6da7cc8db153e42c2606a6c38d661.tar.gz chromium_src-115d7acb7eb6da7cc8db153e42c2606a6c38d661.tar.bz2 | |
Revert 193649 "Change PolicyLoaderWin to load PReg files if poss..."
Caused lots of unit_tests to fail on XP, such as:
PolicyProviderWinTest/ConfigurationPolicyProviderTest.StringListValue
PolicyProviderWinTest/ConfigurationPolicyProviderTest.IntegerValue
> 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
TBR=mnissler@chromium.org
Review URL: https://codereview.chromium.org/14087006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193793 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 28613f4..88fc0da 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::kRegistryChromePolicyKey, 0, + result = ::RegOpenKeyExW(kRootKeys[i], policy::kRegistryMandatorySubKey, 0, KEY_QUERY_VALUE, &key); if (result == ERROR_SUCCESS) { DWORD size = 0; |