From 47af65f00a6d9606b6d31a09e4562d59a83f2598 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Mon, 8 Nov 2010 21:43:55 +0000 Subject: Reapply part of r64637, which caused mysterious failures on mac waterfall. This applies only the rename of IPC::ContextMenuParams to IPC::MiniContextMenuParams so that it doesn't conflict with ::ContextMenuParams (defined in webkit). This is about half the original patch. BUG=51409 TEST=compiles Review URL: http://codereview.chromium.org/4669005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65429 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_frame_activex_base.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome_frame/chrome_frame_activex_base.h') diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 736c690..4504128 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -360,7 +360,7 @@ END_MSG_MAP() } bool HandleContextMenuCommand(UINT cmd, - const IPC::ContextMenuParams& params) { + const IPC::MiniContextMenuParams& params) { if (cmd == IDC_ABOUT_CHROME_FRAME) { int tab_handle = automation_client_->tab()->handle(); HostNavigate(GURL("about:version"), GURL(), NEW_WINDOW); @@ -521,7 +521,7 @@ END_MSG_MAP() virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle, int align_flags, - const IPC::ContextMenuParams& params) { + const IPC::MiniContextMenuParams& params) { scoped_refptr ref(this); ChromeFramePlugin::OnHandleContextMenu(tab_handle, menu_handle, align_flags, params); -- cgit v1.1