diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 00:31:53 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 00:31:53 +0000 |
| commit | 8c0a4284d50894ecc26f996f816c1f32cabbabb3 (patch) | |
| tree | 1d7b791d1855547d6ab752f0af0e82b0ea54e3c5 /chrome/browser/policy | |
| parent | 357f1705d94ad22ef188f381e9b5277a41e3e96c (diff) | |
| download | chromium_src-8c0a4284d50894ecc26f996f816c1f32cabbabb3.zip chromium_src-8c0a4284d50894ecc26f996f816c1f32cabbabb3.tar.gz chromium_src-8c0a4284d50894ecc26f996f816c1f32cabbabb3.tar.bz2 | |
Reland r57575 - Remove the default argument from RegKey::Open.
This fix the bad rebase conflict.
BUG=44644
TEST=base_unittests --gtest_filter=RegistryTest.*
Review URL: http://codereview.chromium.org/3185032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/configuration_policy_provider_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/policy/configuration_policy_provider_win.cc b/chrome/browser/policy/configuration_policy_provider_win.cc index 5d79da6..0ccb559 100644 --- a/chrome/browser/policy/configuration_policy_provider_win.cc +++ b/chrome/browser/policy/configuration_policy_provider_win.cc @@ -62,13 +62,13 @@ bool ConfigurationPolicyProviderWin::GetRegistryPolicyString( string16 path = string16(policy::kRegistrySubKey); RegKey policy_key; // First try the global policy. - if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str())) { + if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) { if (ReadRegistryStringValue(&policy_key, name, result)) return true; policy_key.Close(); } // Fall back on user-specific policy. - if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str())) + if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str(), KEY_READ)) return false; return ReadRegistryStringValue(&policy_key, name, result); } @@ -100,10 +100,10 @@ bool ConfigurationPolicyProviderWin::GetRegistryPolicyStringList( string16 path = string16(policy::kRegistrySubKey); path += ASCIIToUTF16("\\") + key; RegKey policy_key; - if (!policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str())) { + if (!policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) { policy_key.Close(); // Fall back on user-specific policy. - if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str())) + if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str(), KEY_READ)) return false; } string16 policy_string; |