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_npapi.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_npapi.h')
| -rw-r--r-- | chrome_frame/chrome_frame_npapi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_npapi.h b/chrome_frame/chrome_frame_npapi.h index 5101592..d606090 100644 --- a/chrome_frame/chrome_frame_npapi.h +++ b/chrome_frame/chrome_frame_npapi.h @@ -128,7 +128,8 @@ END_MSG_MAP() static void InitializeIdentifiers(); bool PreProcessContextMenu(HMENU menu); - bool HandleContextMenuCommand(UINT cmd, const IPC::ContextMenuParams& params); + bool HandleContextMenuCommand(UINT cmd, + const IPC::MiniContextMenuParams& params); protected: // Handler for accelerator messages passed on from the hosted chrome // instance. |