summaryrefslogtreecommitdiffstats
path: root/chrome_frame/external_tab.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 21:43:55 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 21:43:55 +0000
commit47af65f00a6d9606b6d31a09e4562d59a83f2598 (patch)
tree486879c031214c2126dd750c8638c4d745198a84 /chrome_frame/external_tab.cc
parente027da19eb4b219f44a19ffae90c33e77ed06a34 (diff)
downloadchromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.zip
chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.tar.gz
chromium_src-47af65f00a6d9606b6d31a09e4562d59a83f2598.tar.bz2
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
Diffstat (limited to 'chrome_frame/external_tab.cc')
-rw-r--r--chrome_frame/external_tab.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index 211b48d..785f6af 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -273,8 +273,10 @@ void ExternalTabProxy::HandleAccelerator(const MSG& accel_message) {
&UIDelegate::OnHandleAccelerator, accel_message));
}
-void ExternalTabProxy::HandleContextMenu(HANDLE menu_handle, int align_flags,
- const IPC::ContextMenuParams& params) {
+void ExternalTabProxy::HandleContextMenu(
+ HANDLE menu_handle,
+ int align_flags,
+ const IPC::MiniContextMenuParams& params) {
ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_,
&UIDelegate::OnHandleContextMenu, menu_handle, align_flags, params));
}