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 /webkit | |
| 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 'webkit')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc index df75cc0..7a2e314 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc @@ -412,7 +412,8 @@ bool WebPluginDelegateImpl::PlatformInitialize() { if ((quirks_ & PLUGIN_QUIRK_PATCH_REGENUMKEYEXW) && win_util::GetWinVersion() == win_util::WINVERSION_XP && !RegKey().Open(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe") && + L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe", + KEY_READ) && !g_iat_patch_reg_enum_key_ex_w.Pointer()->is_patched()) { g_iat_patch_reg_enum_key_ex_w.Pointer()->Patch( L"wmpdxm.dll", "advapi32.dll", "RegEnumKeyExW", |