diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:43:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 21:43:55 +0000 |
| commit | 47af65f00a6d9606b6d31a09e4562d59a83f2598 (patch) | |
| tree | 486879c031214c2126dd750c8638c4d745198a84 /chrome_frame/chrome_frame_activex_base.h | |
| parent | e027da19eb4b219f44a19ffae90c33e77ed06a34 (diff) | |
| download | chromium_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/chrome_frame_activex_base.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<BasePlugin> ref(this); ChromeFramePlugin<T>::OnHandleContextMenu(tab_handle, menu_handle, align_flags, params); |