summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 20:27:16 +0000
committerchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 20:27:16 +0000
commitfb56c27c85e46336d505cf51047345c5389cedba (patch)
treea278db90496c09bd01476cc3b43d662bb7e57400 /webkit/glue
parentd7a49c7c5c445c4f911c65e834305c03604a9ede (diff)
downloadchromium_src-fb56c27c85e46336d505cf51047345c5389cedba.zip
chromium_src-fb56c27c85e46336d505cf51047345c5389cedba.tar.gz
chromium_src-fb56c27c85e46336d505cf51047345c5389cedba.tar.bz2
Revert 57572 - Remove the default argument from RegKey::Open.
Caused a failure on Windows Chromium Builder (dbg): ...\configuration_policy_provider_win.cc(71) : error C2660: 'RegKey::Open' : function does not take 2 arguments BUG=44644 TEST=base_unittests --gtest_filter=RegistryTest.* Review URL: http://codereview.chromium.org/3205007 TBR=tfarina@chromium.org Review URL: http://codereview.chromium.org/3211004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl_win.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
index 7a2e314..df75cc0 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
@@ -412,8 +412,7 @@ 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",
- KEY_READ) &&
+ L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe") &&
!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",